设备商城金额换成真实,配置文件更改,配置微信模板消息,快递鸟相关
This commit is contained in:
@@ -49,6 +49,21 @@ public class BannerController {
|
||||
List<Banner> banners = bannerService.queryBannerList(queryBanner);
|
||||
return ResultGenerator.genSuccessResult(banners);
|
||||
}
|
||||
@PostMapping("/queryCarousel")
|
||||
@ApiOperation(tags = {"页面-首页"}, value = "查询所有的轮播图", notes = "查询所有的轮播图", httpMethod = "POST")
|
||||
public Result<List<Banner>> queryCarousel(@RequestBody Banner banner) {
|
||||
if (banner == null) {
|
||||
return ResultGenerator.genFailResult("参数错误!");
|
||||
}
|
||||
if (banner.getType() == null || StringUtil.isEmpty(banner.getType())) {
|
||||
return ResultGenerator.genFailResult("查询参数错误!");
|
||||
}
|
||||
|
||||
Banner queryBanner = new Banner();
|
||||
queryBanner.setType(banner.getType());
|
||||
List<Banner> banners = bannerService.queryBannerList(queryBanner);
|
||||
return ResultGenerator.genSuccessResult(banners);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
@ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
|
||||
|
||||
@@ -121,8 +121,8 @@ public class MercOrderDetailController {
|
||||
* 查看物流信息(快递鸟)
|
||||
*/
|
||||
@GetMapping("/logistic")
|
||||
public Result<Object> logistic(@RequestParam String expressNo)throws Exception{
|
||||
JSONObject expressInfo = mercOrderExpressService.getExpressInfo(expressNo);
|
||||
public Result<Object> logistic(@RequestParam String orderNo)throws Exception{
|
||||
JSONObject expressInfo = mercOrderExpressService.getExpressInfo(orderNo);
|
||||
if (expressInfo.isEmpty()){
|
||||
return ResultGenerator.genFailResult("无法查询快递信息");
|
||||
}else {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
spring:
|
||||
datasource:
|
||||
url: jdbc:mysql://rm-bp19ib8x213kh9t45.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
|
||||
url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: prodCZGmysqlroot@123
|
||||
driver-class-name: com.mysql.jdbc.Driver
|
||||
|
||||
@@ -5,7 +5,7 @@ spring:
|
||||
profiles:
|
||||
### 将一些固定的配置放到下级文件夹下的yml文件中
|
||||
include: common, ryx, ys
|
||||
active: dev
|
||||
active: prod
|
||||
mvc:
|
||||
view:
|
||||
prefix: /WEB-INF/jsp/
|
||||
@@ -22,6 +22,6 @@ spring:
|
||||
max-size: 20
|
||||
|
||||
server:
|
||||
servlet:
|
||||
context-path: /api
|
||||
# servlet:
|
||||
# context-path: /api
|
||||
port: 7004
|
||||
|
||||
Reference in New Issue
Block a user