From 7992072da553cdbc0b7cfb2211d45ba4fdce4ebe Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Sat, 5 Jul 2025 17:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=80=E6=AC=BE=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/vo/RefundAudit.java        | 1 +
 src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java | 2 +-
 src/main/resources/mapper/AuditMapper.xml                        | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/RefundAudit.java b/src/main/java/com/example/demo/domain/vo/RefundAudit.java
index 727b2e4..3d994d6 100644
--- a/src/main/java/com/example/demo/domain/vo/RefundAudit.java
+++ b/src/main/java/com/example/demo/domain/vo/RefundAudit.java
@@ -33,6 +33,7 @@ public class RefundAudit {
     private Integer permanentGold; // 永久金币
     private Integer freeGold; // 免费金币
     private Integer freeJune;   // 6月免费金币
+    private String refundType;    //退款类型
     private Integer freeDecember; // 12月免费金币
     private Integer taskGold; // 任务金币
     private String remark; // 备注
diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
index 7ea5776..8ba488c 100644
--- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
@@ -46,7 +46,7 @@ public class AuditServiceImpl implements AuditService {
             updateOrder.setAuditStatus(2);
             updateOrder.setRejectReason(rejectReason);
             updateOrder.setAuditTime(new Date());
-            auditMapper.updateOrder(updateOrder);
+
             if (order.getType()==2) {  //退款
                 //2.获取对应的消费订单（退款订单号去掉开头"TK"即为对应消费订单）
                 String consumeOrderCode = order.getOrderCode().replaceFirst("TK", "");
diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml
index 0f627ee..aacbef8 100644
--- a/src/main/resources/mapper/AuditMapper.xml
+++ b/src/main/resources/mapper/AuditMapper.xml
@@ -9,6 +9,8 @@
             reject_reason = #{rejectReason},
             audit_time = #{auditTime}
         where order_code = #{orderCode}
+        order by create_time DESC
+        limit 1
     </update>
     <!--更新用户余额-->
     <update id="updateUserGold">
@@ -34,6 +36,8 @@
 
     <select id="selectOrderByOrderCode" resultType="com.example.demo.domain.entity.UserGoldRecord">
         select * from user_gold_record where order_code = #{orderCode}
+        ORDER BY create_time DESC
+        limit 1
     </select>
     <!--多条件查询充值审核订单-->
     <select id="selectRechargeBy" resultType="com.example.demo.domain.vo.RechargeAudit">
@@ -47,7 +51,6 @@
         LEFT JOIN user u ON ugr.jwcode = u.jwcode
         LEFT JOIN admin a1 ON ugr.admin_id = a1.id
         LEFT JOIN admin a2 ON ugr.audit_id = a2.id
-
         <where>
             <if test="rechargeAudit.jwcode != null and rechargeAudit.jwcode != ''">
                 AND ugr.jwcode = #{rechargeAudit.jwcode}