From 32bf13c5313879d533af71d03d0ba0d3af76c169 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Mon, 13 Apr 2020 17:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8D=95=E6=98=8E=E7=BB=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/user/web/controller/UserBillController.java    | 7 +++++--
 .../yixiang/modules/shop/rest/SystemStoreController.java   | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

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<Object> 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<Object> deleteAll(@RequestBody Integer[] ids) {
+        //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作");
         yxSystemStoreService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }