From 06c4dda1b9205254db3c381e6a1806ee64e94fab Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Fri, 22 Aug 2025 17:01:29 +0800
Subject: [PATCH 1/7] =?UTF-8?q?8=E6=9C=8822=E8=AE=A2=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java  | 2 ++
 src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java | 3 ++-
 src/main/resources/mapper/ConsumeMapper.xml                     | 1 +
 src/main/resources/mapper/RechargeMapper.xml                    | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
index 87c5582..5a184a8 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
@@ -31,6 +31,8 @@ public class ConsumeUser implements Serializable {
 
     @ExcelProperty("客户姓名")
     private String name; // 客户姓名
+    @ExcelProperty("订单号")
+    private String orderCode; // 订单号
     @ExcelProperty("精网号")
     private Integer jwcode; // 精网号
     @ExcelProperty("所属地区")
diff --git a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java
index 9d8059f..ceff93e 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java
@@ -28,7 +28,8 @@ public class RechargeUser {
 
     @ExcelProperty("客户姓名")
     private String name; // 客户姓名
-
+    @ExcelProperty("订单号")
+    private String orderCode; // 订单号
     @ExcelProperty("精网号")
     private Integer jwcode; // 精网号
 
diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml
index 68a913b..c791b92 100644
--- a/src/main/resources/mapper/ConsumeMapper.xml
+++ b/src/main/resources/mapper/ConsumeMapper.xml
@@ -76,6 +76,7 @@
     <select id="selectBy" resultType="com.example.demo.domain.vo.coin.ConsumeUser">
         SELECT u.name AS name,
         ugr.jwcode AS jwcode,
+        ugr.order_code AS orderCode,
         m.name as market,
         ugr.goods_name AS goodsName,
         ugr.pay_platform AS payPlatform,
diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml
index d25a599..ab7fd57 100644
--- a/src/main/resources/mapper/RechargeMapper.xml
+++ b/src/main/resources/mapper/RechargeMapper.xml
@@ -79,6 +79,7 @@
         ugr.jwcode AS jwcode,
         m.name as market,
         ugr.activity AS activity,
+        ugr.order_code AS orderCode,
         ugr.rate_id AS rateId,
         r.rate_name AS rateName,
         ugr.money/100 AS money,

From d3bd71dc8af981d0e333c9baaff4ea34e8b85033 Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Sun, 24 Aug 2025 09:10:05 +0800
Subject: [PATCH 2/7] =?UTF-8?q?8=E6=9C=8824=E6=97=A5=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java  | 5 +++--
 src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java | 7 +++----
 src/main/java/com/example/demo/domain/vo/coin/RefundUser.java   | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
index 5a184a8..53fc485 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
@@ -29,7 +29,7 @@ public class ConsumeUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ExcelProperty("客户姓名")
+    @ExcelProperty("姓名")
     private String name; // 客户姓名
     @ExcelProperty("订单号")
     private String orderCode; // 订单号
@@ -51,7 +51,8 @@ public class ConsumeUser implements Serializable {
     private BigDecimal taskGold; // 任务金币
     @ExcelProperty("备注")
     private String remark; // 备注
-    @ExcelProperty("提交人ID")
+    @ExcelIgnore
+//    @ExcelProperty("提交人ID")
     private Integer adminId; //提交人Id
     @ExcelProperty("提交人姓名")
     private String adminName; //提交人姓名
diff --git a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java
index ceff93e..b7e9bfe 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java
@@ -26,7 +26,7 @@ public class RechargeUser {
 
     private static final long serialVersionUID = 1L;
 
-    @ExcelProperty("客户姓名")
+    @ExcelProperty("姓名")
     private String name; // 客户姓名
     @ExcelProperty("订单号")
     private String orderCode; // 订单号
@@ -65,11 +65,10 @@ public class RechargeUser {
 
     @ExcelProperty("备注")
     private String remark; // 备注
-
-    @ExcelProperty("提交人Id")
+    @ExcelIgnore
     private Integer adminId; // 提交人Id
 
-    @ExcelProperty("提交人姓名")
+    @ExcelProperty("提交人")
     private String adminName; // 提交人姓名
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
diff --git a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java
index d7e51c1..7dbffe8 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java
@@ -29,7 +29,7 @@ public class RefundUser {
 
     @ExcelProperty("订单号")
     private String orderCode; // 订单号
-    @ExcelProperty("客户姓名")
+    @ExcelProperty("姓名")
     private String name; // 客户姓名
     @ExcelProperty("精网号")
     private Integer jwcode; // 精网号
@@ -51,7 +51,8 @@ public class RefundUser {
     private BigDecimal taskGold; // 任务金币
     @ExcelProperty("退款原因")
     private String remark; // 退款原因
-    @ExcelProperty("提交人ID")
+//    @ExcelProperty("提交人ID")
+    @ExcelIgnore
     private Integer adminId; //提交人Id
     @ExcelProperty("提交人姓名")
     private String adminName; //提交人姓名

From 89a26193f27d94176840edae815cd5436aa19871 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Sun, 24 Aug 2025 09:18:32 +0800
Subject: [PATCH 3/7] =?UTF-8?q?8.24=E9=87=91=E5=B8=81=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/Mysql/MysqlServiceImpl.java    |  9 +++++----
 src/main/java/com/example/demo/domain/entity/User.java   |  6 +++---
 .../java/com/example/demo/domain/vo/coin/GoldDetail.java |  8 ++++----
 src/main/resources/mapper/UserMapper.xml                 | 16 ++++++++--------
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java
index da86316..5459a82 100644
--- a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java
+++ b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java
@@ -119,6 +119,7 @@ public class MysqlServiceImpl implements MysqlService {
                             String operation_platform = resultSet.getString("operation_platform");
                             String goods_name = resultSet.getString("goods_name");
                             String timestampPart = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
+                            String orderNumber = UUID.randomUUID().toString().replaceAll("-", "");
 
                             if (StringUtils.isNumeric(name)) {
                                 Integer admin_id = Integer.valueOf(adminService.getId(name));
@@ -139,24 +140,24 @@ public class MysqlServiceImpl implements MysqlService {
                             if (validZeroTypes.contains(gtype)) {
                                 mysqlStmt.setInt(13, 0);
                                 mysqlStmt.setNull(20, java.sql.Types.INTEGER);
-                                mysqlStmt.setString(1, "ERPCZ_" + timestampPart + randomNumber);
+                                mysqlStmt.setString(1, "ERPCZ_" +orderNumber );
                             }
                             if (validOneTypes.contains(gtype)) {
                                 mysqlStmt.setInt(13, 1);
                                 mysqlStmt.setInt(20, 0);
-                                mysqlStmt.setString(1, "ERPXF_" + timestampPart + randomNumber);
+                                mysqlStmt.setString(1, "ERPXF_" + orderNumber);
                             }
                             if (validTwoTypes.contains(gtype)) {
                                 mysqlStmt.setInt(13, 2);
                                 mysqlStmt.setInt(20, 0);
-                                mysqlStmt.setString(1, "ERPTK_" + timestampPart + randomNumber);
+                                mysqlStmt.setString(1, "ERPTK_" +orderNumber);
                                 mysqlStmt.setString(10, "退款商品");
                                 mysqlStmt.setInt(11, 0);
                             }
                             if (validThreeTypes.contains(gtype)) {
                                 mysqlStmt.setInt(13, 3);
                                 mysqlStmt.setNull(20, java.sql.Types.INTEGER);
-                                mysqlStmt.setString(1, "ERPQT_" + timestampPart + randomNumber);
+                                mysqlStmt.setString(1, "ERPQT_" +orderNumber);
                             }
 
                             mysqlStmt.setInt(2, jwcode);
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 84df75d..f5ee35d 100644
--- a/src/main/java/com/example/demo/domain/entity/User.java
+++ b/src/main/java/com/example/demo/domain/entity/User.java
@@ -22,7 +22,7 @@ public class User implements Serializable {
     private Integer id; // 客户id
     @ExcelProperty("精网号")
     private Integer jwcode; // 精网号
-    @ExcelProperty("客户姓名")
+    @ExcelProperty("姓名")
     private String name; // 客户姓名
     @ExcelProperty("所属地区")
     private String market; // 所属地区
@@ -38,9 +38,9 @@ public class User implements Serializable {
     private BigDecimal sumGold;// 金币总数
     @ExcelProperty("当前永久金币")
     private BigDecimal currentPermanentGold; // 当前永久金币
-    @ExcelProperty("当前六月免费金币")
+    @ExcelProperty("当前到期六月免费金币")
     private BigDecimal currentFreeJune; // 当前六月免费金币
-    @ExcelProperty("当前十二月免费金币")
+    @ExcelProperty("当前到期十二月免费金币")
     private BigDecimal currentFreeDecember; // 当前十二月免费金币
     @ExcelProperty("当前任务金币")
     private BigDecimal currentTaskGold; // 当前任务金币
diff --git a/src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java b/src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java
index 35ce6e2..a22844f 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java
@@ -26,17 +26,17 @@ public class GoldDetail {
 
     @ExcelIgnore
     private String token;
-    @ExcelProperty("名称")
+    @ExcelProperty("姓名")
     private String name;    // 名称
     @ExcelProperty("精网号")
     private Integer jwcode; // 精网号
     @ExcelProperty("所属地区")
     private String market;  // 所属地区
-    @ExcelProperty("支付平台")
+    @ExcelProperty("平台信息")
     private String payPlatform; // 支付平台
-    @ExcelProperty("类型")
+    @ExcelProperty("更新类型")
     private Integer type;   // 类型
-    @ExcelProperty("总金币")
+    @ExcelProperty("金币数量")
     private BigDecimal sumGold;    // 总金币
     @ExcelProperty("永久金币")
     private BigDecimal permanentGold;    //永久金币
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index ae97d94..168c21a 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -42,14 +42,14 @@
     u.name AS "name",
     u.jwcode AS "jwcode",
     m.name AS "market",
-    (COALESCE(u.current_permanent_gold, 0) + COALESCE(u.current_free_june, 0) + COALESCE(u.current_free_december, 0) + COALESCE(u.current_task_gold, 0)) AS "nowSumGold",
-    u.current_permanent_gold AS "nowPermanentGold",
-    (COALESCE(u.current_free_june, 0) + COALESCE(u.current_free_december, 0)) AS "nowFreeGold",
-    u.current_task_gold AS "nowTaskGold",
-    (COALESCE(u.sum_permanent_gold, 0) + COALESCE(u.sum_free_june, 0) + COALESCE(u.sum_free_december, 0) + COALESCE(u.sum_task_gold, 0)) AS "historySumGold",
-    u.sum_permanent_gold AS "historyPermanentGold",
-    (COALESCE(u.sum_free_june, 0) + COALESCE(u.sum_free_december, 0)) AS "historyFreeGold",
-    u.sum_task_gold AS "historyTaskGold",
+    ROUND((IFNULL(u.current_permanent_gold, 0) + IFNULL(u.current_free_june, 0) + IFNULL(u.current_free_december, 0) + IFNULL(u.current_task_gold, 0)) / 100.0, 2) AS nowSumGold,
+    ROUND(IFNULL(u.current_permanent_gold, 0) / 100.0, 2) AS nowPermanentGold,
+    ROUND((IFNULL(u.current_free_june, 0) + IFNULL(u.current_free_december, 0)) / 100.0, 2) AS nowFreeGold,
+    ROUND(IFNULL(u.current_task_gold, 0) / 100.0, 2) AS nowTaskGold,
+    ROUND((IFNULL(u.sum_permanent_gold, 0) + IFNULL(u.sum_free_june, 0) + IFNULL(u.sum_free_december, 0) + IFNULL(u.sum_task_gold, 0)) / 100.0, 2) AS historySumGold,
+    ROUND(IFNULL(u.sum_permanent_gold, 0) / 100.0, 2) AS historyPermanentGold,
+    ROUND((IFNULL(u.sum_free_june, 0) + IFNULL(u.sum_free_december, 0)) / 100.0, 2) AS historyFreeGold,
+        u.sum_task_gold AS "historyTaskGold",
     u.recharge_num AS "rechargeNum",
     u.consume_num AS "consumeNum",
     u.first_recharge AS "firstRecharge"

From 4079f72b333752036187706533204c718cc5d486 Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Sun, 24 Aug 2025 10:22:30 +0800
Subject: [PATCH 4/7] =?UTF-8?q?8=E6=9C=882=204=E6=97=A5=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java  | 2 +-
 src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java | 2 +-
 src/main/java/com/example/demo/domain/vo/coin/RefundUser.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
index 53fc485..ccefd04 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
@@ -58,7 +58,7 @@ public class ConsumeUser implements Serializable {
     private String adminName; //提交人姓名
     @ExcelProperty("是否退款")
     private Integer isRefund; //是否退款
-    @ExcelProperty("消费时间")
+    @ExcelProperty("消耗时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime; // 消费时间
     @ExcelIgnore
diff --git a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java
index b7e9bfe..1513dfb 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java
@@ -72,7 +72,7 @@ public class RechargeUser {
     private String adminName; // 提交人姓名
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
-    @ExcelProperty("创建时间")
+    @ExcelProperty("充值时间")
     private Date payTime; // 创建时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @ExcelProperty("审核时间")
diff --git a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java
index 7dbffe8..fa4b2e6 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java
@@ -57,7 +57,7 @@ public class RefundUser {
     @ExcelProperty("提交人姓名")
     private String adminName; //提交人姓名
 
-    @ExcelProperty("创建时间")
+    @ExcelProperty("提交时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime; // 创建时间
     @ExcelProperty("审核时间")

From 896fdfa17671f602648c157c372c232590a816a8 Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Sun, 24 Aug 2025 13:07:34 +0800
Subject: [PATCH 5/7] =?UTF-8?q?8=E6=9C=8824=E6=97=A5=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java  | 6 +++---
 src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java | 6 +++---
 src/main/java/com/example/demo/domain/vo/coin/RefundUser.java   | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
index ccefd04..fa6616e 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java
@@ -39,9 +39,9 @@ public class ConsumeUser implements Serializable {
     private String market; // 所属地区
     @ExcelProperty("商品名称")
     private String goodsName; // 商品名称
-    @ExcelProperty("充值方式")
+    @ExcelProperty("消耗平台")
     private String payPlatform; // 消费平台
-    @ExcelProperty("金币总数")
+    @ExcelProperty("消耗金币总数")
     private BigDecimal sumGold; // 金币总数
     @ExcelProperty("永久金币")
     private BigDecimal permanentGold; // 永久金币
@@ -54,7 +54,7 @@ public class ConsumeUser implements Serializable {
     @ExcelIgnore
 //    @ExcelProperty("提交人ID")
     private Integer adminId; //提交人Id
-    @ExcelProperty("提交人姓名")
+    @ExcelProperty("提交人")
     private String adminName; //提交人姓名
     @ExcelProperty("是否退款")
     private Integer isRefund; //是否退款
diff --git a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java
index 1513dfb..9bb01fc 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java
@@ -57,7 +57,7 @@ public class RechargeUser {
     @ExcelProperty("支付方式")
     private String payModel; // 支付方式
 
-    @ExcelProperty("充值方式")
+    @ExcelProperty("充值平台")
     private String payPlatform; // 充值方式
 
     @ExcelProperty("支付凭证")
@@ -72,10 +72,10 @@ public class RechargeUser {
     private String adminName; // 提交人姓名
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
-    @ExcelProperty("充值时间")
+    @ExcelProperty("付款时间")
     private Date payTime; // 创建时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
-    @ExcelProperty("审核时间")
+    @ExcelProperty("充值时间")
     private Date auditTime; // 审核时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @ExcelIgnore
diff --git a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java
index fa4b2e6..606d990 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java
@@ -41,7 +41,7 @@ public class RefundUser {
     private String refundType; // 退款类型
     @ExcelProperty("退款方式")
     private Byte refundModel; // 退款方式（0全部/1部分退款）
-    @ExcelProperty("金币总数")
+    @ExcelProperty("退款金币总数")
     private BigDecimal sumGold; // 金币总数
     @ExcelProperty("永久金币")
     private BigDecimal permanentGold; // 永久金币
@@ -54,13 +54,13 @@ public class RefundUser {
 //    @ExcelProperty("提交人ID")
     @ExcelIgnore
     private Integer adminId; //提交人Id
-    @ExcelProperty("提交人姓名")
+    @ExcelProperty("提交人")
     private String adminName; //提交人姓名
 
     @ExcelProperty("提交时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime; // 创建时间
-    @ExcelProperty("审核时间")
+    @ExcelProperty("退款时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date auditTime; // 审核时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")

From 9207747db279c0c56847208b5a86131779241529 Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Sun, 24 Aug 2025 13:40:05 +0800
Subject: [PATCH 6/7] =?UTF-8?q?8=E6=9C=8824=E6=97=A5=E6=B6=88=E8=80=97?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/ConsumeMapper.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml
index c791b92..687cc18 100644
--- a/src/main/resources/mapper/ConsumeMapper.xml
+++ b/src/main/resources/mapper/ConsumeMapper.xml
@@ -86,7 +86,8 @@
         ugr.task_gold/100 AS taskGold,
         ugr.remark AS remark,
         a.admin_name AS adminName,
-        ugr.create_time AS createTime
+        ugr.create_time AS createTime,
+        ugr.is_refund AS isRefund,
         FROM user_gold_record ugr
         left JOIN
         user u ON u.jwcode = ugr.jwcode

From cc31fe64a9929b8189624e2337c56a16641a58d7 Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Sun, 24 Aug 2025 14:13:35 +0800
Subject: [PATCH 7/7] =?UTF-8?q?8=E6=9C=8824=E6=97=A5=E6=B6=88=E8=80=97?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/ConsumeMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml
index 687cc18..905243a 100644
--- a/src/main/resources/mapper/ConsumeMapper.xml
+++ b/src/main/resources/mapper/ConsumeMapper.xml
@@ -87,7 +87,7 @@
         ugr.remark AS remark,
         a.admin_name AS adminName,
         ugr.create_time AS createTime,
-        ugr.is_refund AS isRefund,
+        ugr.is_refund AS isRefund
         FROM user_gold_record ugr
         left JOIN
         user u ON u.jwcode = ugr.jwcode