From 6a4a5ce421130fda68e5097a73c3902ffd8fceb7 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Fri, 22 Aug 2025 16:35:13 +0800
Subject: [PATCH] =?UTF-8?q?8.22=E4=BF=AE=E6=94=B9=E9=87=91=E5=B8=81?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=98=A0=E5=B0=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/Mysql/MysqlServiceImpl.java   | 11 ++++++-----
 .../java/com/example/demo/domain/entity/User.java  | 22 ++++++++++++----------
 src/main/resources/mapper/GoldDetailMapper.xml     |  1 +
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java
index 09b0920..da86316 100644
--- a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java
+++ b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java
@@ -155,6 +155,7 @@ public class MysqlServiceImpl implements MysqlService {
                             }
                             if (validThreeTypes.contains(gtype)) {
                                 mysqlStmt.setInt(13, 3);
+                                mysqlStmt.setNull(20, java.sql.Types.INTEGER);
                                 mysqlStmt.setString(1, "ERPQT_" + timestampPart + randomNumber);
                             }
 
@@ -171,17 +172,17 @@ public class MysqlServiceImpl implements MysqlService {
                             }
                             mysqlStmt.setInt(7, core_jb);
                             if (operation_platform.equals("1")) {
-                                mysqlStmt.setString(8, "6");
+                                mysqlStmt.setString(8, "ERP");
                             } else if (operation_platform.equals("2")) {
-                                mysqlStmt.setString(8, "5");
+                                mysqlStmt.setString(8, "HomilyLink");
                             } else if (operation_platform.equals("3")) {
-                                mysqlStmt.setString(8, "3");
+                                mysqlStmt.setString(8, "HomilyChart");
                             } else if (operation_platform.equals("4")) {
                                 continue;
                             } else if (operation_platform.equals("0")) {
-                                mysqlStmt.setString(8, "4");
+                                mysqlStmt.setString(8, "初始化金币");
                             } else {
-                                mysqlStmt.setString(8, "2");
+                                mysqlStmt.setString(8, "其他");
                             }
                             mysqlStmt.setString(9, goods_name);
                             mysqlStmt.setString(12, remark);
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 b93bd10..84df75d 100644
--- a/src/main/java/com/example/demo/domain/entity/User.java
+++ b/src/main/java/com/example/demo/domain/entity/User.java
@@ -26,14 +26,16 @@ public class User implements Serializable {
     private String name; // 客户姓名
     @ExcelProperty("所属地区")
     private String market; // 所属地区
-    @ExcelProperty("历史永久金币")
+    @ExcelIgnore
     private BigDecimal sumPermanentGold; // 历史永久金币
-    @ExcelProperty("历史六月免费金币")
+    @ExcelIgnore
     private BigDecimal sumFreeJune; // 历史六月免费金币
-    @ExcelProperty("历史十二月免费金币")
+    @ExcelIgnore
     private BigDecimal sumFreeDecember; // 历史十二月免费金币
-    @ExcelProperty("历史任务金币")
+    @ExcelIgnore
     private BigDecimal sumTaskGold; // 历史任务金币
+    @ExcelProperty("金币总数")
+    private BigDecimal sumGold;// 金币总数
     @ExcelProperty("当前永久金币")
     private BigDecimal currentPermanentGold; // 当前永久金币
     @ExcelProperty("当前六月免费金币")
@@ -42,17 +44,17 @@ public class User implements Serializable {
     private BigDecimal currentFreeDecember; // 当前十二月免费金币
     @ExcelProperty("当前任务金币")
     private BigDecimal currentTaskGold; // 当前任务金币
-    @ExcelProperty("充值次数")
+    @ExcelProperty("充值次数(25年起)")
     private Integer rechargeNum; // 充值次数
-    @ExcelProperty("历史消费")
+    @ExcelIgnore
     private Integer sumConsume; // 历史消费
-    @ExcelProperty("历史消费次数")
+    @ExcelProperty("消费次数(25年起)")
     private Integer consumeNum; // 消费次数
-    @ExcelProperty("历史消费永久金币")
+    @ExcelIgnore
     private BigDecimal sumConsumePermanent;
-    @ExcelProperty("历史消费任务金币")
+    @ExcelIgnore
     private BigDecimal sumConsumeTask;
-    @ExcelProperty("历史消费免费金币")
+    @ExcelIgnore
     private BigDecimal sumConsumeFree;
     @ExcelIgnore
     private List<String> markets;
diff --git a/src/main/resources/mapper/GoldDetailMapper.xml b/src/main/resources/mapper/GoldDetailMapper.xml
index e870296..8037ab0 100644
--- a/src/main/resources/mapper/GoldDetailMapper.xml
+++ b/src/main/resources/mapper/GoldDetailMapper.xml
@@ -101,6 +101,7 @@
         u.jwcode,
         u.name,
         m.name AS market,
+        ROUND(IFNULL(u.current_permanent_gold+u.current_free_june+u.current_free_december+u.current_task_gold, 0) / 100.0, 2) AS sumGold,
         ROUND(IFNULL(u.sum_permanent_gold, 0) / 100.0, 2) AS sumPermanentGold,
         ROUND(IFNULL(u.sum_free_june, 0) / 100.0, 2) AS sumFreeJune,
         ROUND(IFNULL(u.sum_free_december, 0) / 100.0, 2) AS sumFreeDecember,