From f0db83bf61a8e063b0566722f9a6ceb56d6ae439 Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Wed, 9 Jul 2025 14:11:18 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/vo/ConsumeUser.java      |  1 +
 .../java/com/example/demo/serviceImpl/RefundServiceImpl.java   | 10 ++++++++++
 src/main/resources/mapper/ConsumeMapper.xml                    |  3 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/domain/vo/ConsumeUser.java b/src/main/java/com/example/demo/domain/vo/ConsumeUser.java
index d2370ce..9b6f364 100644
--- a/src/main/java/com/example/demo/domain/vo/ConsumeUser.java
+++ b/src/main/java/com/example/demo/domain/vo/ConsumeUser.java
@@ -37,6 +37,7 @@ public class ConsumeUser implements Serializable {
     private String remark; // 备注
     private Integer adminId; //提交人Id
     private String adminName; //提交人姓名
+    private Integer isRefund; //是否退款
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime; // 消费时间
diff --git a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
index 5b5ecc2..085a575 100644
--- a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.Console;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -95,6 +96,7 @@ public class RefundServiceImpl implements RefundService {
     @Transactional
     @Override
     public Result add(RefundUser refundUser) {
+        System.out.println("11111111111111111111");
         if (refundUser.getTaskGold() == null || refundUser.getFreeGold() == null || refundUser.getPermanentGold() == null) {
             return Result.error("金币不能为空");
         }
@@ -150,6 +152,14 @@ public class RefundServiceImpl implements RefundService {
         List<ConsumeUser> list = consumeMapper.selectOrderCodeByJwcode(userGoldRecord.getJwcode().toString(), orderCode);
         if (list == null || list.isEmpty()) {
             return Result.error("该用户没有该订单号");
+        }else if(list.size()==1){
+            ConsumeUser consumeUser = list.getFirst();
+            if(consumeUser.getIsRefund().equals(1))
+            {
+                return Result.error("该订单已被退款");
+            }
+        }else {
+            return Result.error("消费订单重复");
         }
         refundMapper.add(userGoldRecord);
         consumeMapper.updateIsRefund(orderCode);
diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml
index ce5134c..8263303 100644
--- a/src/main/resources/mapper/ConsumeMapper.xml
+++ b/src/main/resources/mapper/ConsumeMapper.xml
@@ -134,7 +134,8 @@
     <select id="selectOrderCodeByJwcode" resultType="com.example.demo.domain.vo.ConsumeUser">
         SELECT
         ugr.jwcode AS jwcode,
-        ugr.order_code AS orderCode
+        ugr.order_code AS orderCode,
+        ugr.is_refund AS isRefund
         FROM user_gold_record ugr
         where
             ugr.order_code =  #{orderCode}

From 80039241a7b2567c8046decaa8264486ae403522 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Wed, 9 Jul 2025 15:00:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=85=E5=80=BC=E6=AC=A1=E6=95=B0bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/controller/WorkbenchController.java       | 24 +++++++++-------------
 .../example/demo/service/StatisticsService.java    |  4 ++--
 .../example/demo/serviceImpl/AuditServiceImpl.java |  1 +
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/example/demo/controller/WorkbenchController.java b/src/main/java/com/example/demo/controller/WorkbenchController.java
index f6fcf8c..bad46b7 100644
--- a/src/main/java/com/example/demo/controller/WorkbenchController.java
+++ b/src/main/java/com/example/demo/controller/WorkbenchController.java
@@ -54,18 +54,14 @@ public class WorkbenchController {
         WorkbenchCard result =workbenchService.getGraph(workbench.getToken(),workbench.getStartDate(),workbench.getEndDate(),workbench.getMarkets());
         return ResponseEntity.ok(result);
     }
-    /*
-    测试一段时间内的统计数据
-     */
-  /*  @PostMapping("testSum")
-    public Statistics testSum( @RequestBody TestRequest request){
-        String market = request.getMarket();
-        Date date = request.getDate();
-
-
-        //获取传入日期所在周的周一
-        Date thisWeekStart = workbenchService.getStartOfWeek(date);
-
-        return statisticsMapper.selectSumByMarketAndDate(market, thisWeekStart, date);
-    }*/
+  /*
+  更新统计表并获取卡片数据
+   */
+    @PostMapping("updateCard")
+    public ResponseEntity<WorkbenchCard> updateCard(@RequestBody WorkbenchCard workbench){
+        statisticsService.runHourlyTaskPart1(); //更新余量数据
+        statisticsService.runHourlyTaskPart2(); //更新余量外数据
+        WorkbenchCard result =workbenchService.getCard(workbench.getToken());   //获取卡片数据
+        return ResponseEntity.ok(result);
+    }
 }
diff --git a/src/main/java/com/example/demo/service/StatisticsService.java b/src/main/java/com/example/demo/service/StatisticsService.java
index fe06f8e..dc86550 100644
--- a/src/main/java/com/example/demo/service/StatisticsService.java
+++ b/src/main/java/com/example/demo/service/StatisticsService.java
@@ -15,9 +15,9 @@ import java.util.Date;
 
 
 public interface StatisticsService {
-    //1点，12点，18点,23点30分执行定时任务更新当天part1数据
+    //每小时执行定时任务更新当天part1数据
     public void runHourlyTaskPart1();
-    //12点，18点执行定时任务更新当天part2数据
+    //每小时执行定时任务更新当天part2数据
     public void runHourlyTaskPart2();
     //0点执行定时任务更新近一周part2数据
     public void runDailyTaskPart2();
diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
index 851fc95..cc44907 100644
--- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
@@ -78,6 +78,7 @@ public class AuditServiceImpl implements AuditService {
                 update.setCurrentFreeJune(order.getFreeJune()); //当前六月免费金币
                 update.setCurrentFreeDecember(order.getFreeDecember()); //当前十二月免费金币
                 update.setCurrentTaskGold(order.getTaskGold()); //当前任务金币
+                update.setRechargeNum(update.getRechargeNum()+1);   //充值次数加一
                 auditMapper.updateUserGold(update);
                 //erp增加充值数据
                 if(update.getJwcode().equals(94226013)){

From 735b74c1486fdfe1a7ac66bd5fc60fc88da52b29 Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Wed, 9 Jul 2025 16:06:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4111111?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
index 085a575..3c5b9e9 100644
--- a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
@@ -96,7 +96,6 @@ public class RefundServiceImpl implements RefundService {
     @Transactional
     @Override
     public Result add(RefundUser refundUser) {
-        System.out.println("11111111111111111111");
         if (refundUser.getTaskGold() == null || refundUser.getFreeGold() == null || refundUser.getPermanentGold() == null) {
             return Result.error("金币不能为空");
         }