Merge remote-tracking branch 'origin/milestone-20250727-金币重构三期' into milestone-20250727-金币重构三期

src/main/java/com/example/demo/controller/coin/ConsumeController.java

@@ -90,10 +90,12 @@ public class ConsumeController {
                     HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
                     String token = request.getHeader("token");
                     Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
-                    List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
-
-                    if(!markets.contains("总部")&&!markets.contains("研发部")) {
-                        page.getConsumeUser().setMarkets(markets);
+                    if (admin != null) {
+                        List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                        page.getConsumeUser().setMarkets(list);
+                    }
+                    else{
+                        return Result.error("角色为空");
                     }
                 }
                 return Result.success(consumeService.selectBy(page.getPageNum(), page.getPageSize(), page.getConsumeUser()));
@@ -113,10 +115,12 @@ public class ConsumeController {
                 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
                 String token = request.getHeader("token");
                 Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
-                List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
-
-                if(!markets.contains("1")) {
-                    consumeUser.setMarkets(markets);
+                if (admin != null) {
+                    List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                    consumeUser.setMarkets(list);
+                }
+                else{
+                    return Result.error("角色为空");
                 }
             }
             Gold gold = consumeService.statsGold(consumeUser);

src/main/java/com/example/demo/controller/coin/RechargeController.java

@@ -83,8 +83,8 @@ public class RechargeController {
                     HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
                     String token = request.getHeader("token");
                     Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
-                    List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));;
-                    if(!markets.contains("总部")&&!markets.contains("研发部")) {
+                    if (admin != null) {
+                        List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));;
                         page.getRechargeUser().setMarkets(markets);
                     }
                 }
@@ -106,9 +106,7 @@ public class RechargeController {
                 String token = request.getHeader("token");
                 Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
                 List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));;
-                if(!markets.contains("总部")&&!markets.contains("研发部")) {
-                    rechargeUser.setMarkets(markets);
-                }
+                rechargeUser.setMarkets(markets);
             }
             Gold gold = rechargeService.statsGold(rechargeUser);
             return Result.success(gold);

src/main/java/com/example/demo/controller/coin/RefundController.java

@@ -79,10 +79,7 @@ public class RefundController {
                     String token = request.getHeader("token");
                     Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
                     List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
-
-                    if(!markets.contains("总部")&&!markets.contains("研发部")) {
-                        page.getRefundUser().setMarkets(markets);
-                    }
+                    page.getRefundUser().setMarkets(markets);
                 }
                 return Result.success(refundService.selectBy(page.getPageNum(), page.getPageSize(), page.getRefundUser()));
             }
@@ -102,10 +99,7 @@ public class RefundController {
                 String token = request.getHeader("token");
                 Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
                 List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
-
-                if(!markets.contains("1")) {
-                    refundUser.setMarkets(markets);
-                }
+                refundUser.setMarkets(markets);
             }
             Gold gold = refundService.statsGold(refundUser);
             return Result.success(gold);