czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
hankaikai
2023-06-05 14:28:43 +08:00
parent ecbdd3f0b1 fffecb1535
commit 6102029af0
14 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pluss-api-page/src/main/java/cn/pluss/platform/controller/BannerController.java
View File

@@ -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")

4
pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercOrderDetailController.java
View File

@@ -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 {