From 0f4a27a743fc6506e8c5ddb652d23639bf986863 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Sun, 23 Nov 2025 15:46:52 +0800
Subject: [PATCH] 11.21 bug

---
 .../example/demo/domain/vo/cash/CashRecordDone.java |  3 +++
 .../serviceImpl/cash/CashRefundServiceImpl.java     |  8 +++++++-
 .../demo/serviceImpl/cash/MessageServiceImpl.java   |  3 +++
 src/main/resources/cashMapper/CashRefundMapper.xml  | 21 +++++++++++++++------
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java
index 170f203..41215e6 100644
--- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java
+++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java
@@ -119,6 +119,9 @@ public class CashRecordDone {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date eTime;   // 结束时间
     private Integer relatedId;
+    private BigDecimal NewRefundGold;
+    private BigDecimal NewRefundFree;
+    private Integer adminId;
 
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java
index bce68b5..1cad9dd 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java
@@ -232,6 +232,12 @@ public class CashRefundServiceImpl implements RefundService {
         if (cashRecordDone.getRefundReason()== null) {
             throw new RuntimeException("请填写退款理由");
         }
+        if(cashRecordDone.getNewRefundGold()== null){
+            cashRecordDone.setNewRefundGold(BigDecimal.valueOf(0));
+        }
+        if(cashRecordDone.getNewRefundFree()== null){
+            cashRecordDone.setNewRefundFree(BigDecimal.valueOf(0));
+        }
         int result = cashRefundMapper.update(cashRecordDone);
         return (result > 0 ? Result.success("提交成功") : Result.error("提交失败")).getCode();
     }
@@ -346,7 +352,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
             userGoldRecord.setGoodsName(cashRecordDone.getGoodsName());
             userGoldRecord.setPayPlatform("金币系统");
             userGoldRecord.setRemark(cashRecordDone.getRemark());
-            userGoldRecord.setAdminId(cashRecordDone.getAuditId());
+            userGoldRecord.setAdminId(cashRecordDone.getAdminId());
             userGoldRecord.setAuditStatus(1);
             userGoldRecord.setTaskGold(0);
             userGoldRecord.setCreateTime(new Date());
diff --git a/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java
index cffadd4..ff3e85a 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/MessageServiceImpl.java
@@ -24,6 +24,9 @@ public class MessageServiceImpl implements MessageService {
     private MessageMapper messageMapper;
     @Override
     public List<Messages> getMessage(List<String> markets, List<Integer> status) {
+        if(status== null|| status.size()==0){
+            status.add(99);
+        }
         return messageMapper.getMessage(markets, status) ;
     }
 
diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml
index 0f1c364..5ee0f15 100644
--- a/src/main/resources/cashMapper/CashRefundMapper.xml
+++ b/src/main/resources/cashMapper/CashRefundMapper.xml
@@ -72,13 +72,22 @@
                 )
 
     </insert>
+    <!-- ✅ 正确写法：CashRefundMapper.xml -->
     <update id="update">
-        update cash_record_refund
-            set
-        status = 10,
-        refund_model = #{refundModel},
-        refund_reason = #{refundReason}
-        where id = #{id}
+        UPDATE cash_record_refund
+        <set>
+            status = 10,
+            refund_model = #{refundModel},
+            refund_reason = #{refundReason},
+            <if test="newRefundGold != null">
+                permanent_gold = #{newRefundGold},
+            </if>
+            <if test="newRefundFree != null">
+                free_gold = #{newRefundFree}
+                <!-- 注意：最后一个字段不要加逗号！<set> 会自动处理 -->
+            </if>
+        </set>
+        WHERE id = #{id}
     </update>
     <update id="withdraw">
         update cash_record_refund set status = 11