From 27126b7e2eed1a776d188f7dd054e6b9f53fb5bf Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Tue, 5 Aug 2025 15:59:02 +0800 Subject: [PATCH] =?UTF-8?q?8=E6=9C=885=E6=97=A5=E5=9C=B0=E5=8C=BA=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/coin/ConsumeController.java | 20 ++++++++++++-------- .../demo/controller/coin/RechargeController.java | 8 +++----- .../demo/controller/coin/RefundController.java | 10 ++-------- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/example/demo/controller/coin/ConsumeController.java b/src/main/java/com/example/demo/controller/coin/ConsumeController.java index 9b513c5..95bf0a1 100644 --- a/src/main/java/com/example/demo/controller/coin/ConsumeController.java +++ b/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 markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ",")); - - if(!markets.contains("总部")&&!markets.contains("研发部")) { - page.getConsumeUser().setMarkets(markets); + if (admin != null) { + List 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 markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ",")); - - if(!markets.contains("1")) { - consumeUser.setMarkets(markets); + if (admin != null) { + List list = Arrays.asList(admin.getMarkets().split(",")); + consumeUser.setMarkets(list); + } + else{ + return Result.error("角色为空"); } } Gold gold = consumeService.statsGold(consumeUser); diff --git a/src/main/java/com/example/demo/controller/coin/RechargeController.java b/src/main/java/com/example/demo/controller/coin/RechargeController.java index 3d88769..08c00b1 100644 --- a/src/main/java/com/example/demo/controller/coin/RechargeController.java +++ b/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 markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));; - if(!markets.contains("总部")&&!markets.contains("研发部")) { + if (admin != null) { + List 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 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); diff --git a/src/main/java/com/example/demo/controller/coin/RefundController.java b/src/main/java/com/example/demo/controller/coin/RefundController.java index a2e8f09..0181d23 100644 --- a/src/main/java/com/example/demo/controller/coin/RefundController.java +++ b/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 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 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);