Merge remote-tracking branch 'origin/master' into hqz

src/main/java/com/example/demo/controller/WorkbenchController.java

@@ -1,9 +1,6 @@
 package com.example.demo.controller;
 
-import com.example.demo.domain.vo.Workbench;
-import com.example.demo.domain.vo.WorkbenchOne;
-import com.example.demo.domain.vo.WorkbenchThree;
-import com.example.demo.domain.vo.WorkbenchTwo;
+import com.example.demo.domain.vo.WorkbenchCard;
 import com.example.demo.service.WorkbenchService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -33,21 +30,21 @@ public class WorkbenchController {
     获取工作台卡片一的数据
      */
     @PostMapping("card1")
-    public WorkbenchOne card1(@RequestBody Workbench workbench){
-        return WorkbenchService.getCard1(workbench.getToken(),workbench.getAreas());
+    public WorkbenchCard card1(@RequestBody WorkbenchCard workbench){
+        return WorkbenchService.getCard1(workbench.getToken(),workbench.getMarket());
     }
     /*
     获取工作台卡片二的数据
      */
     @PostMapping("card2")
-    public WorkbenchTwo card2(@RequestBody Workbench workbench){
-        return WorkbenchService.getCard2(workbench.getToken(),workbench.getAreas());
+    public WorkbenchCard card2(@RequestBody WorkbenchCard workbench){
+        return WorkbenchService.getCard2(workbench.getToken(),workbench.getMarket());
     }
     /*
     获取工作台卡片三的数据
      */
     @PostMapping("card3")
-    public WorkbenchThree card3(@RequestBody Workbench workbench){
-        return WorkbenchService.getCard3(workbench.getToken(),workbench.getAreas());
+    public WorkbenchCard card3(@RequestBody WorkbenchCard workbench){
+        return WorkbenchService.getCard3(workbench.getToken(),workbench.getMarket());
     }
 }

src/main/java/com/example/demo/domain/entity/Statistics.java

@@ -38,7 +38,7 @@ public class Statistics implements Serializable {
     private Integer consumeFreeJune;    // 当日新增消费(六月免费)
     private Integer consumeFreeDecember;    // 当日新增消费（十二月免费）
     private Integer consumeTask;    // 当日新增消费(任务)
-    private Integer refundPermanent;    // 当日新增退款
+    private Integer refundPermanent;    // 当日新增退款(永久)
     private Integer refundFreeJune;    // 当日新增退款(六月免费)
     private Integer refundFreeDecember;    // 当日新增退款(十二月免费)
     private Integer refundTask;    // 当日新增退款(任务)

src/main/java/com/example/demo/domain/entity/UserGoldRecord.java

@@ -30,13 +30,13 @@ public class UserGoldRecord implements Serializable {
     private String voucher; // 支付凭证
     private String goodsName; // 商品名称
     private String refundType; // 退款类型
-    private Byte refundModel; // 退款方式（全部/部分退款）
+    private Byte refundModel; // 退款方式（0全部/1部分退款）
     private String remark; // 备注
-    private Byte type; // 类型（充值/消耗/退款）
-    private Byte isRefund; // 是否已退款（消耗限定）
+    private Byte type; // 类型（0充值/1消耗/2退款）
+    private Byte isRefund; // 是否已退款（消费限定）1退款0未退款
     private Integer adminId; // 用户（提交人）id
     private Integer auditId; // 审核人id
-    private Integer auditStatus; // 审核状态（待审核、通过、驳回、外部传入【默认通过】）
+    private Integer auditStatus; // 审核状态（0待审核、1通过、2驳回、3外部传入【默认通过】）
     private String rejectReason; // 驳回理由
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")

src/main/java/com/example/demo/domain/vo/Workbench.java

@@ -1,25 +0,0 @@
-package com.example.demo.domain.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @program: gold-java
- * @ClassName Workbench
- * @description: 工作台请求参数
- * @author: Ethan
- * @create: 2025−06-17 17:43
- * @Version 1.0
- **/
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class Workbench implements Serializable {
-    private String token;   //用户token
-    private List<String> areas;  //地区列表
-}

src/main/java/com/example/demo/domain/vo/WorkbenchCard.java

@@ -0,0 +1,61 @@
+package com.example.demo.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: gold-java
+ * @ClassName Workbench
+ * @description: 工作台请求参数
+ * @author: Ethan
+ * @create: 2025−06-17 17:43
+ * @Version 1.0
+ **/
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class WorkbenchCard implements Serializable {
+    private String token;   //用户token
+    private List<String> market; // 地区
+    //  卡片一：当前金币相关
+    private Integer currentGold; // 当前金币余量
+    private Integer dailyChange; // 余量较前一天的变化
+    private Integer currentPermanent; // 永久金币余量
+    private Integer currentFreeJune; // 六月到期免费金币余量
+    private Integer currentFreeDecember; // 十二月到期免费金币余量
+    private Integer currentTask; // 任务金币余量
+    private Integer currentFree; // 免费金币余量（currentFreeJune + currentFreeDecember）
+
+    //  卡片二：充值相关
+    private Integer recharge; // 当日充值金币数
+    private Integer money; // 当日金额（永久金币）
+    private Integer yearlyRecharge; // 全年累计充值金币数
+    private Integer yearlyMoney; // 全年累计金额
+
+    //  卡片三：当日消费/退款/消耗相关
+    private Integer consumePermanent; // 当日新增消费（永久）
+    private Integer consumeFreeJune; // 当日新增消费（六月免费）
+    private Integer consumeFreeDecember; // 当日新增消费（十二月免费）
+    private Integer consumeTask; // 当日新增消费（任务）
+    private Integer refundPermanent; // 当日新增退款（永久）
+    private Integer refundFreeJune; // 当日新增退款（六月免费）
+    private Integer refundFreeDecember; // 当日新增退款（十二月免费）
+    private Integer refundTask; // 当日新增退款（任务）
+    private Integer dailyConsume; // 当日总消耗 = consumePermanent + consumeFreeJune + consumeFreeDecember + consumeTask - (refundPermanent + refundFreeJune + refundFreeDecember + refundTask)
+    private Integer yearlyConsume; // 全年累计消费
+    private Integer yearlyRefund; // 全年累计退款金币数
+    private Integer yearlyReduce; // 全年累计消耗金币数 = yearlyConsume - yearlyRefund
+
+    //  卡片四：人头数相关
+    private Integer rechargeNum; // 当日充值人数
+    private Integer firstRecharge; // 当日首充人数
+    private Integer wow; // 周同比（%）
+    private Integer daily; // 日环比（%）
+    private Integer yearlyRechargeNum; // 全年累计充值人头数
+
+}

src/main/java/com/example/demo/domain/vo/WorkbenchOne.java

@@ -1,32 +0,0 @@
-package com.example.demo.domain.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @program: gold-java
- * @ClassName Workbench
- * @description: 工作台卡片1——当前金币余量
- * @author: Ethan
- * @create: 2025−06-17 17:47
- * @Version 1.0
- **/
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class WorkbenchOne implements Serializable {
-    private static final long serialVersionUID = 1L;
-    private String token ;
-    private BigDecimal sumGold ;    //当前金币余量
-    private BigDecimal differ ;     //较前一天的差异量
-    private BigDecimal rechargeGold ;   //永久金币
-    private BigDecimal freeGold ;   //免费金币
-    private BigDecimal taskGold ;   //任务金币
-    private BigDecimal junFreeGold; //六月过期的免费金币
-    private BigDecimal DecFreeGold; //十二月过期的免费金币
-
-}

src/main/java/com/example/demo/domain/vo/WorkbenchThree.java

@@ -1,33 +0,0 @@
-package com.example.demo.domain.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @program: gold-java
- * @ClassName Workbench
- * @description: 工作台卡片3——全年累计消耗金币数
- * @author: Ethan
- * @create: 2025−06-17 17:52
- * @Version 1.0
- **/
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class WorkbenchThree implements Serializable {
-    private static final long serialVersionUID = 1L;
-    private BigDecimal consumeCoin; //全年累计消耗金币数=消费+退款
-    private BigDecimal consumeGold; //消费金币数
-    private BigDecimal refundCoin;  //退款金币数
-    private BigDecimal yesterdayCoin;   //昨日新增消耗
-    private BigDecimal yesterdayGold;   //昨日新增消耗——消费
-    private BigDecimal yesterdayRefund; //昨日新增消费——退款
-    //以下暂时不用
-    private BigDecimal rechargeGold ;   //其中付费金币
-    private BigDecimal freeGold ;   //其中免费金币
-    private BigDecimal taskGold ;   //其中任务金币
-}

src/main/java/com/example/demo/domain/vo/WorkbenchTwo.java

@@ -1,31 +0,0 @@
-package com.example.demo.domain.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @program: gold-java
- * @ClassName Workbench
- * @description: 工作台卡片2——全年累计金币数
- * @author: Ethan
- * @create: 2025−06-17 17:49
- * @Version 1.0
- **/
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class WorkbenchTwo implements Serializable {
-    private static final long serialVersionUID = 1L;
-    private BigDecimal totalGold;   //全年累计金币数
-    private BigDecimal totalCoin;   //折合新币数
-    private BigDecimal yesterdayTotal;  //昨日新增
-    private BigDecimal yesterdayRecharge;   //昨日新增充值
-    //以下暂时不用
-    private BigDecimal rechargeGold ;   //充值付费金币
-    private BigDecimal freeGold ;   //免费金币
-    private BigDecimal taskGold ;   //任务金币
-}

src/main/java/com/example/demo/mapper/WorkBenchMapper.java

@@ -1,8 +1,6 @@
 package com.example.demo.mapper;
 
-import com.example.demo.domain.vo.WorkbenchOne;
-import com.example.demo.domain.vo.WorkbenchThree;
-import com.example.demo.domain.vo.WorkbenchTwo;
+import com.example.demo.domain.vo.WorkbenchCard;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -19,9 +17,9 @@ import java.util.List;
 @Mapper
 public interface WorkBenchMapper {
     //工作台卡片一
-    public WorkbenchOne getCard1(List<String> areas);
+    public WorkbenchCard getCard1(List<String> areas);
     //工作台卡片二
-    public WorkbenchTwo getCard2(List<String> areas);
+    public WorkbenchCard getCard2(List<String> areas);
     //工作台卡片三
-    public WorkbenchThree getCard3(List<String> areas);
+    public WorkbenchCard getCard3(List<String> areas);
 }

src/main/java/com/example/demo/service/WorkbenchService.java

@@ -1,9 +1,6 @@
 package com.example.demo.service;
 
-import com.example.demo.domain.vo.Workbench;
-import com.example.demo.domain.vo.WorkbenchOne;
-import com.example.demo.domain.vo.WorkbenchThree;
-import com.example.demo.domain.vo.WorkbenchTwo;
+import com.example.demo.domain.vo.WorkbenchCard;
 
 import java.util.List;
 
@@ -18,7 +15,7 @@ import java.util.List;
 
 
 public interface WorkbenchService {
-    WorkbenchOne getCard1(String token, List<String>areas);
-    WorkbenchTwo getCard2(String token, List<String>areas);
-    WorkbenchThree getCard3(String token, List<String>areas);
+    WorkbenchCard getCard1(String token, List<String>areas);
+    WorkbenchCard getCard2(String token, List<String>areas);
+    WorkbenchCard getCard3(String token, List<String>areas);
 }

src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java

@@ -1,8 +1,6 @@
 package com.example.demo.serviceImpl;
 
-import com.example.demo.domain.vo.WorkbenchOne;
-import com.example.demo.domain.vo.WorkbenchThree;
-import com.example.demo.domain.vo.WorkbenchTwo;
+import com.example.demo.domain.vo.WorkbenchCard;
 import com.example.demo.mapper.WorkBenchMapper;
 import com.example.demo.service.WorkbenchService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,17 +23,19 @@ public class WorkbenchServiceImpl implements WorkbenchService {
     @Autowired
     private WorkBenchMapper workbenchMapper;
     @Override
-    public WorkbenchOne getCard1(String token, List<String> areas) {
+    public WorkbenchCard getCard1(String token, List<String> areas) {
         return workbenchMapper.getCard1(areas);
     }
 
     @Override
-    public WorkbenchTwo getCard2(String token, List<String> areas) {
+    public WorkbenchCard getCard2(String token, List<String> areas) {
+
         return workbenchMapper.getCard2(areas);
     }
 
     @Override
-    public WorkbenchThree getCard3(String token, List<String> areas) {
+    public WorkbenchCard getCard3(String token, List<String> areas) {
+
         return workbenchMapper.getCard3(areas);
     }
 }