From c6c08f402a4a0e8e3f009d804e602b31fe070853 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Mon, 21 Jul 2025 14:32:12 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D-=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E3=80=81=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E6=9D=83=E9=99=90=E3=80=81=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/controller/WorkbenchController.java | 5 +---- .../java/com/example/demo/serviceImpl/AuditServiceImpl.java | 11 ++++++----- .../com/example/demo/serviceImpl/GeneralServiceImpl.java | 4 ++++ .../com/example/demo/serviceImpl/WorkbenchServiceImpl.java | 2 -- src/main/resources/mapper/AuditMapper.xml | 2 +- src/main/resources/mapper/WorkBenchMapper.xml | 12 +----------- 6 files changed, 13 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/example/demo/controller/WorkbenchController.java b/src/main/java/com/example/demo/controller/WorkbenchController.java index 6916b77..f02b2e5 100644 --- a/src/main/java/com/example/demo/controller/WorkbenchController.java +++ b/src/main/java/com/example/demo/controller/WorkbenchController.java @@ -78,10 +78,7 @@ public class WorkbenchController { String account = admin.getAccount(); List markets = generalService.getRoleMarket(account); - //判断是否是总部 - if (markets != null && markets.contains("总部")) { - markets=generalService.getMarket();//总部有所有地区的权限 - } + workbench.setMarkets(markets); WorkbenchCard result =workbenchService.getGraph(workbench.getStartDate(),workbench.getEndDate(),workbench.getMarkets()); return ResponseEntity.ok(result); diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index a7e1114..8decde3 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -73,10 +73,7 @@ public class AuditServiceImpl implements AuditService { } } }else if (action==1) { //通过 - updateOrder.setAuditStatus(1); - updateOrder.setAuditTime(new Date()); - // 执行审核更新 - auditMapper.updateOrder(updateOrder); + //判断是充值还是退款 if (order.getType()==0){ //充值 //更新用户余额 @@ -92,7 +89,7 @@ public class AuditServiceImpl implements AuditService { update.setCurrentFreeJune(order.getFreeJune()); //当前六月免费金币 update.setCurrentFreeDecember(order.getFreeDecember()); //当前十二月免费金币 update.setCurrentTaskGold(order.getTaskGold()); //当前任务金币 - update.setRechargeNum(gold.getRechargeNum()+1); //充值次数加一 + update.setRechargeNum(1); //充值次数加一 auditMapper.updateUserGold(update); //erp增加充值数据 // if(update.getJwcode().equals(94226013)){ @@ -126,6 +123,10 @@ public class AuditServiceImpl implements AuditService { // } } + updateOrder.setAuditStatus(1); + updateOrder.setAuditTime(new Date()); + // 执行审核更新 + auditMapper.updateOrder(updateOrder); } return true; diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java index d8c8bc7..2bcc130 100644 --- a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java @@ -123,6 +123,10 @@ public class GeneralServiceImpl implements GeneralService { throw new Exception("没有地区权限"); } List list = Arrays.asList(market.split(",")); + //判断是否是总部 + if (list != null && list.contains("总部")) { + list=getMarket();//总部有所有地区的权限 + } return list; } catch (Exception e) { // 记录日志 diff --git a/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java index e5c9a31..5be8b72 100644 --- a/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java @@ -203,8 +203,6 @@ public class WorkbenchServiceImpl implements WorkbenchService { sums.put("cFree", stats.getTotalConsumeFree() != null ? stats.getTotalConsumeFree() : 0); sums.put("cTask", stats.getTotalConsumeTask() != null ? stats.getTotalConsumeTask() : 0); sums.put("consume", sums.get("cPermanent") + sums.get("cFree") + sums.get("cTask")); - sums.put("refund", stats.getTotalRefund() != null ? stats.getTotalRefund() : 0); - sums.put("rechargeNum", stats.getTotalRechargeNum() != null ? stats.getTotalRechargeNum() : 0); WorkbenchMarketGraph graph = new WorkbenchMarketGraph(); graph.setMarket(market); diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index 2465906..b42e648 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -23,7 +23,7 @@ current_free_june = current_free_june + COALESCE(#{currentFreeJune},0), current_free_december = current_free_december + COALESCE(#{currentFreeDecember},0), current_task_gold = current_task_gold + COALESCE(#{currentTaskGold},0), - recharge_num = #{rechargeNum} + recharge_num = recharge_num+COALESCE(#{rechargeNum},0) where jwcode = #{jwcode} diff --git a/src/main/resources/mapper/WorkBenchMapper.xml b/src/main/resources/mapper/WorkBenchMapper.xml index bbd075e..fb5c796 100644 --- a/src/main/resources/mapper/WorkBenchMapper.xml +++ b/src/main/resources/mapper/WorkBenchMapper.xml @@ -118,17 +118,7 @@ SUM(s.money) AS totalMoney, SUM(s.consume_permanent) AS totalConsumePermanent, SUM(s.consume_free_june + s.consume_free_december) AS totalConsumeFree, - SUM(s.consume_task) AS totalConsumeTask, - SUM(s.refund_permanent + s.refund_free_june + s.refund_free_december + s.refund_task) AS totalRefund, - ( - SELECT COUNT(DISTINCT ugr.jwcode) - FROM user_gold_record ugr - INNER JOIN user u ON ugr.jwcode = u.jwcode - WHERE u.market = s.market - AND ugr.pay_time BETWEEN #{startDate} AND #{endDate} - AND ugr.audit_status IN (1, 3) - and ugr.flag=1 - ) AS totalRechargeNum + SUM(s.consume_task) AS totalConsumeTask FROM statistics s WHERE s.market IN #{market}