diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java index 694e6dcd..bdd73cfa 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/web/controller/UserBillController.java @@ -10,6 +10,7 @@ package co.yixiang.modules.user.web.controller; import cn.hutool.core.img.ImgUtil; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.qrcode.QrCodeUtil; @@ -325,10 +326,12 @@ public class UserBillController extends BaseController { @GetMapping("/spread/commission/{type}") @ApiOperation(value = "推广佣金明细",notes = "推广佣金明细") public ApiResult spreadCommission(YxUserBillQueryParam queryParam, - @PathVariable int type){ + @PathVariable String type){ + int newType = 0; + if(NumberUtil.isNumber(type)) newType = Integer.valueOf(type); int uid = SecurityUtils.getUserId().intValue(); return ApiResult.ok(userBillService.getUserBillList(queryParam.getPage().intValue(), - queryParam.getLimit().intValue(),uid,type)); + queryParam.getLimit().intValue(),uid,newType)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java index 20172ed2..9bcba45d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java @@ -103,6 +103,7 @@ public class SystemStoreController { @PreAuthorize("@el.check('yxSystemStore:del')") @DeleteMapping public ResponseEntity deleteAll(@RequestBody Integer[] ids) { + //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); yxSystemStoreService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); }