From 98809d0366ab2141aed65cc13b7d83ff2d0b2277 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Fri, 30 Jan 2026 14:20:31 +0800
Subject: [PATCH] =?UTF-8?q?01-30=20=E6=9F=A5=E8=AF=A2=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=EF=BC=8C=E7=B2=BE=E7=AE=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/domain/vo/coin/GoldRepeat.java    |  5 -----
 src/main/resources/mapper/RechargeMapper.xml           | 18 +++++++++---------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/coin/GoldRepeat.java b/src/main/java/com/example/demo/domain/vo/coin/GoldRepeat.java
index eb900eb..f56f34a 100644
--- a/src/main/java/com/example/demo/domain/vo/coin/GoldRepeat.java
+++ b/src/main/java/com/example/demo/domain/vo/coin/GoldRepeat.java
@@ -36,15 +36,10 @@ public class GoldRepeat implements Serializable {
     private Byte type; // 类型（0充值/1消耗/2退款）
     private Byte isRefund; // 是否已退款（消费限定）1退款0未退款
 
-    private String adminName; // 用户（提交人）姓名
-    private Integer auditId; // 审核人id
     private Integer auditStatus; // 审核状态（0待审核、1通过、2驳回、3外部传入【默认通过】）
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime; // 创建时间
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
-    private Date updateTime; // 更新时间
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date auditTime; // 审核时间
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml
index 4e7cb3a..4d3c8aa 100644
--- a/src/main/resources/mapper/RechargeMapper.xml
+++ b/src/main/resources/mapper/RechargeMapper.xml
@@ -268,14 +268,14 @@
     </select>
     <!--根据订单单号获取订单信息（重复充值/消费提示）-->
     <select id="selectByOrderCode" resultType="com.example.demo.domain.vo.coin.GoldRepeat">
-        select ugr.type,ugr.order_code,ugr.jwcode,
-               COALESCE(ugr.permanent_gold,0)/100 as permanentGold,
-               COALESCE(ugr.free_june,0)/100 as freeJune,
-               COALESCE(ugr.free_december,0)/100 as freeDecember,
-               COALESCE(ugr.task_gold,0)/100 as taskGold,
-               ugr.audit_time,u.name AS adminName,ugr.goods_name,ugr.is_refund,ugr.create_time,ugr.audit_status
-        from user_gold_record ugr
-        left join user u on u.jwcode = ugr.admin_id
-        where ugr.order_code = #{orderCode}
+        select type,order_code,jwcode,
+               COALESCE(permanent_gold,0)/100 as permanentGold,
+               COALESCE(free_june,0)/100 as freeJune,
+               COALESCE(free_december,0)/100 as freeDecember,
+               COALESCE(task_gold,0)/100 as taskGold,
+               audit_time,goods_name,is_refund,create_time,audit_status
+        from user_gold_record
+
+        where order_code = #{orderCode}
     </select>
 </mapper>
\ No newline at end of file