From a7b7e4c808f4d59f0fe9ae823e43518554d76686 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Tue, 5 Aug 2025 11:42:21 +0800 Subject: [PATCH 1/6] =?UTF-8?q?8=E6=9C=885=E6=97=A5=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=8D=A1=E7=89=87=E5=9C=B0=E5=8C=BA=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/UserMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml index c288009..cf783b6 100644 --- a/src/main/resources/mapper/UserMapper.xml +++ b/src/main/resources/mapper/UserMapper.xml @@ -57,10 +57,10 @@ jwcode = #{jwcode} - + AND ( - market LIKE CONCAT('%', #{market}, '%') + u.market = #{market} ) From 3cf02b3f2c00dc62be3b6f5ae2f3878a58301747 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Tue, 5 Aug 2025 13:34:00 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=85=85=E5=80=BC=E9=A9=B3=E5=9B=9Ebug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java index f9a377a..c814028 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java @@ -69,13 +69,13 @@ public class AuditServiceImpl implements AuditService { auditMapper.updateOrderRefund(consumeOrderCode,(byte)0); }else { throw new IllegalArgumentException("找不到对应的订单或不是有效订单"); - } + } } updateOrder.setAuditStatus(2); updateOrder.setRejectReason(rejectReason); updateOrder.setAuditTime(new Date()); // 执行审核更新 auditMapper.updateOrder(updateOrder); - } + }else if (action==1) { //通过 //判断是充值还是退款 From f572bb33ee4bcaabc22c8ab906537c468e852699 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Tue, 5 Aug 2025 14:38:44 +0800 Subject: [PATCH 3/6] =?UTF-8?q?8=E6=9C=885=E6=97=A5=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/controller/coin/ConsumeController.java | 2 +- .../java/com/example/demo/controller/coin/RechargeController.java | 4 ++-- src/main/java/com/example/demo/controller/coin/RefundController.java | 2 +- 3 files changed, 4 insertions(+), 4 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 e07de1d..9b513c5 100644 --- a/src/main/java/com/example/demo/controller/coin/ConsumeController.java +++ b/src/main/java/com/example/demo/controller/coin/ConsumeController.java @@ -92,7 +92,7 @@ public class ConsumeController { Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); List markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ",")); - if(!markets.contains("1")) { + if(!markets.contains("总部")&&!markets.contains("研发部")) { page.getConsumeUser().setMarkets(markets); } } 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 7fcbfa2..3d88769 100644 --- a/src/main/java/com/example/demo/controller/coin/RechargeController.java +++ b/src/main/java/com/example/demo/controller/coin/RechargeController.java @@ -84,7 +84,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("1")) { + if(!markets.contains("总部")&&!markets.contains("研发部")) { page.getRechargeUser().setMarkets(markets); } } @@ -106,7 +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("1")) { + if(!markets.contains("总部")&&!markets.contains("研发部")) { rechargeUser.setMarkets(markets); } } 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 ef1f6ba..a2e8f09 100644 --- a/src/main/java/com/example/demo/controller/coin/RefundController.java +++ b/src/main/java/com/example/demo/controller/coin/RefundController.java @@ -80,7 +80,7 @@ public class RefundController { Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); List markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ",")); - if(!markets.contains("1")) { + if(!markets.contains("总部")&&!markets.contains("研发部")) { page.getRefundUser().setMarkets(markets); } } From 27126b7e2eed1a776d188f7dd054e6b9f53fb5bf Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Tue, 5 Aug 2025 15:59:02 +0800 Subject: [PATCH 4/6] =?UTF-8?q?8=E6=9C=885=E6=97=A5=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E6=9D=83=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); From b7041c16f8798d3c3ecd2cfe01cbe1d799a5dc73 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Tue, 5 Aug 2025 16:15:21 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/GoldDetailMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mapper/GoldDetailMapper.xml b/src/main/resources/mapper/GoldDetailMapper.xml index a3bd91c..55676db 100644 --- a/src/main/resources/mapper/GoldDetailMapper.xml +++ b/src/main/resources/mapper/GoldDetailMapper.xml @@ -7,11 +7,12 @@