Merge remote-tracking branch 'origin/milestone-20250711-金币重构二期' into milestone-20250711-金币重构二期

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

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("首充日期")