Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期

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);
+    }
 }

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; // 消费时间

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();

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)){

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;
@@ -150,6 +151,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);

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}