From f23c60d3499a57470b1767c86b2bfa5a0f0b3636 Mon Sep 17 00:00:00 2001 From: jianlin Date: Mon, 23 Jun 2025 10:05:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=966-23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/WorkbenchController.java | 17 +++--- .../com/example/demo/domain/entity/Statistics.java | 2 +- .../java/com/example/demo/domain/entity/User.java | 4 +- .../example/demo/domain/entity/UserGoldRecord.java | 10 ++-- .../java/com/example/demo/domain/vo/Workbench.java | 25 --------- .../com/example/demo/domain/vo/WorkbenchCard.java | 61 ++++++++++++++++++++++ .../com/example/demo/domain/vo/WorkbenchOne.java | 32 ------------ .../com/example/demo/domain/vo/WorkbenchThree.java | 33 ------------ .../com/example/demo/domain/vo/WorkbenchTwo.java | 31 ----------- .../com/example/demo/mapper/WorkBenchMapper.java | 10 ++-- .../com/example/demo/service/WorkbenchService.java | 11 ++-- .../demo/serviceImpl/WorkbenchServiceImpl.java | 12 ++--- 12 files changed, 90 insertions(+), 158 deletions(-) delete mode 100644 src/main/java/com/example/demo/domain/vo/Workbench.java create mode 100644 src/main/java/com/example/demo/domain/vo/WorkbenchCard.java delete mode 100644 src/main/java/com/example/demo/domain/vo/WorkbenchOne.java delete mode 100644 src/main/java/com/example/demo/domain/vo/WorkbenchThree.java delete mode 100644 src/main/java/com/example/demo/domain/vo/WorkbenchTwo.java diff --git a/src/main/java/com/example/demo/controller/WorkbenchController.java b/src/main/java/com/example/demo/controller/WorkbenchController.java index 4c25484..3e28a33 100644 --- a/src/main/java/com/example/demo/controller/WorkbenchController.java +++ b/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()); } } diff --git a/src/main/java/com/example/demo/domain/entity/Statistics.java b/src/main/java/com/example/demo/domain/entity/Statistics.java index d6970ee..2597e9a 100644 --- a/src/main/java/com/example/demo/domain/entity/Statistics.java +++ b/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; // 当日新增退款(任务) diff --git a/src/main/java/com/example/demo/domain/entity/User.java b/src/main/java/com/example/demo/domain/entity/User.java index 33eef20..625421e 100644 --- a/src/main/java/com/example/demo/domain/entity/User.java +++ b/src/main/java/com/example/demo/domain/entity/User.java @@ -18,11 +18,11 @@ public class User implements Serializable { private Integer jwcode; // 精网号 private String name; // 客户姓名 private String market; // 所属地区 - private Integer sumPermentGold; // 历史永久金币 + private Integer sumPermanentGold; // 历史永久金币 private Integer sumFreeJune; // 历史六月免费金币 private Integer sumFreeDecember; // 历史十二月免费金币 private Integer sumTaskGold; // 历史任务金币 - private Integer currentPermentGold; // 当前永久金币 + private Integer currentPermanentGold; // 当前永久金币 private Integer currentFreeJune; // 当前六月免费金币 private Integer currentFreeDecember; // 当前十二月免费金币 private Integer currentTaskGold; // 当前任务金币 diff --git a/src/main/java/com/example/demo/domain/entity/UserGoldRecord.java b/src/main/java/com/example/demo/domain/entity/UserGoldRecord.java index da1e6a7..8bf2317 100644 --- a/src/main/java/com/example/demo/domain/entity/UserGoldRecord.java +++ b/src/main/java/com/example/demo/domain/entity/UserGoldRecord.java @@ -19,7 +19,7 @@ public class UserGoldRecord implements Serializable { private Integer jwcode; // 精网号 private String activity; // 活动名称 private Integer sumGold; // 金币总数 - private Integer permentGold; // 永久金币 + private Integer permanentGold; // 永久金币 private Integer freeJune; // 六月免费金币 private Integer freeDecember; // 十二月免费金币 private Integer taskGold; // 任务金币 @@ -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") diff --git a/src/main/java/com/example/demo/domain/vo/Workbench.java b/src/main/java/com/example/demo/domain/vo/Workbench.java deleted file mode 100644 index d456849..0000000 --- a/src/main/java/com/example/demo/domain/vo/Workbench.java +++ /dev/null @@ -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 areas; //地区列表 -} diff --git a/src/main/java/com/example/demo/domain/vo/WorkbenchCard.java b/src/main/java/com/example/demo/domain/vo/WorkbenchCard.java new file mode 100644 index 0000000..bd2d397 --- /dev/null +++ b/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 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; // 全年累计充值人头数 + +} diff --git a/src/main/java/com/example/demo/domain/vo/WorkbenchOne.java b/src/main/java/com/example/demo/domain/vo/WorkbenchOne.java deleted file mode 100644 index bc88020..0000000 --- a/src/main/java/com/example/demo/domain/vo/WorkbenchOne.java +++ /dev/null @@ -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; //十二月过期的免费金币 - -} diff --git a/src/main/java/com/example/demo/domain/vo/WorkbenchThree.java b/src/main/java/com/example/demo/domain/vo/WorkbenchThree.java deleted file mode 100644 index 1d612a6..0000000 --- a/src/main/java/com/example/demo/domain/vo/WorkbenchThree.java +++ /dev/null @@ -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 ; //其中任务金币 -} diff --git a/src/main/java/com/example/demo/domain/vo/WorkbenchTwo.java b/src/main/java/com/example/demo/domain/vo/WorkbenchTwo.java deleted file mode 100644 index 2d2f09f..0000000 --- a/src/main/java/com/example/demo/domain/vo/WorkbenchTwo.java +++ /dev/null @@ -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 ; //任务金币 -} diff --git a/src/main/java/com/example/demo/mapper/WorkBenchMapper.java b/src/main/java/com/example/demo/mapper/WorkBenchMapper.java index 15a7c44..ac94011 100644 --- a/src/main/java/com/example/demo/mapper/WorkBenchMapper.java +++ b/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 areas); + public WorkbenchCard getCard1(List areas); //工作台卡片二 - public WorkbenchTwo getCard2(List areas); + public WorkbenchCard getCard2(List areas); //工作台卡片三 - public WorkbenchThree getCard3(List areas); + public WorkbenchCard getCard3(List areas); } diff --git a/src/main/java/com/example/demo/service/WorkbenchService.java b/src/main/java/com/example/demo/service/WorkbenchService.java index 12b3361..cdc0aaa 100644 --- a/src/main/java/com/example/demo/service/WorkbenchService.java +++ b/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, Listareas); - WorkbenchTwo getCard2(String token, Listareas); - WorkbenchThree getCard3(String token, Listareas); + WorkbenchCard getCard1(String token, Listareas); + WorkbenchCard getCard2(String token, Listareas); + WorkbenchCard getCard3(String token, Listareas); } diff --git a/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java index e8fcd2f..72e539f 100644 --- a/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java +++ b/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 areas) { + public WorkbenchCard getCard1(String token, List areas) { return workbenchMapper.getCard1(areas); } @Override - public WorkbenchTwo getCard2(String token, List areas) { + public WorkbenchCard getCard2(String token, List areas) { + return workbenchMapper.getCard2(areas); } @Override - public WorkbenchThree getCard3(String token, List areas) { + public WorkbenchCard getCard3(String token, List areas) { + return workbenchMapper.getCard3(areas); } }