From 91c135295cefcd593d06bde646b900628252093c Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Tue, 22 Jul 2025 10:53:59 +0800
Subject: [PATCH] =?UTF-8?q?7.22=E5=90=8E=E7=AB=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=9B=E5=8E=86=E5=8F=B2=E6=B6=88=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/Mysql/MysqlServiceImpl.java   | 26 +++++++++++++++++-----
 .../java/com/example/demo/domain/entity/User.java  |  8 +++++++
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java
index 224a8e9..4643675 100644
--- a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java
+++ b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java
@@ -117,6 +117,8 @@ public class MysqlServiceImpl implements MysqlService {
                         if(validTwoTypes.contains(gtype)){
                             mysqlStmt.setInt(13, 2);
                             mysqlStmt.setString(1, "ERPTK"+timestampPart+randomNumber);
+                            mysqlStmt.setString(10,"退款商品");
+                            mysqlStmt.setInt(11, 0);
                         }
                         if(validThreeTypes.contains(gtype)){
                             mysqlStmt.setInt(13, 3);
@@ -154,8 +156,6 @@ public class MysqlServiceImpl implements MysqlService {
                             mysqlStmt.setString(8, "其他");
                         }
                         mysqlStmt.setString(9, goods_name);
-                        mysqlStmt.setString(10,"退款商品");
-                        mysqlStmt.setInt(11, 0);
                         mysqlStmt.setString(12, remark);
                         mysqlStmt.setInt(15, 3);
                         mysqlStmt.setTimestamp(16, created_at);
@@ -231,23 +231,37 @@ public class MysqlServiceImpl implements MysqlService {
                                 logger.info("用户添加成功");
                                 user = userService.selectAllUser(String.valueOf(jwcode));
                             }
-                           user.setSumPermanentGold(user.getSumPermanentGold()+buy_jb);
+
                             if(currentMonth.getValue() >= 7){
-                                user.setSumFreeJune(user.getSumFreeJune()+free);
                                 user.setCurrentFreeJune(user.getCurrentFreeJune()+free);
                             }
                             if(currentMonth.getValue() <7){
-                                user.setSumFreeDecember(user.getSumFreeDecember()+free);
                                 user.setCurrentFreeDecember(user.getCurrentFreeDecember()+free);
                             }
-                            user.setSumTaskGold(user.getSumTaskGold()+core_jb);
+
                             user.setCurrentPermanentGold(user.getCurrentPermanentGold()+buy_jb);
                             user.setCurrentTaskGold(user.getCurrentTaskGold()+core_jb);
                             if(validZeroTypes.contains(gtype)) {
                                 user.setRechargeNum(user.getRechargeNum() + 1);
+                                user.setSumPermanentGold(user.getSumPermanentGold()+buy_jb);
+                                user.setSumTaskGold(user.getSumTaskGold()+core_jb);
+                                if(currentMonth.getValue() >= 7){
+                                    user.setSumFreeJune(user.getSumFreeJune()+free);
+                                }
+                                if(currentMonth.getValue() < 7){
+                                    user.setSumFreeDecember(user.getSumFreeDecember()+free);
+                                }
                             }
                             if (validOneTypes.contains(gtype)){
                                 user.setConsumeNum(user.getConsumeNum() + 1);
+                                user.setSumConsumeGold(user.getSumConsumeGold() + buy_jb);
+                                user.setSumConsumeTaskGold(user.getSumConsumeTaskGold() + core_jb);
+                                if(currentMonth.getValue() >= 7){
+                                    user.setSumConsumeJune(user.getSumConsumeJune()+free);
+                                }
+                                if(currentMonth.getValue() < 7){
+                                    user.setSumConsumeDecember(user.getSumFreeDecember()+free);
+                                }
                             }
                             userService.updateAllGold(user);
 
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 14589dc..5f97982 100644
--- a/src/main/java/com/example/demo/domain/entity/User.java
+++ b/src/main/java/com/example/demo/domain/entity/User.java
@@ -47,6 +47,14 @@ public class User implements Serializable {
     private Integer sumConsume; // 历史消费
     @ExcelProperty("历史消费次数")
     private Integer consumeNum; // 消费次数
+    @ExcelProperty("历史消费永久金币")
+    private Integer sumConsumeGold;
+    @ExcelProperty("历史消费任务金币")
+    private Integer sumConsumeTaskGold;
+    @ExcelProperty("历史消费六月金币")
+    private Integer sumConsumeJune;
+    @ExcelProperty("历史消费十二月金币")
+    private Integer sumConsumeDecember;
     @ExcelIgnore
     private List<String> markets;
 @ExcelProperty("首充日期")