From 76c6f41165dedc3dfaa32a4bed21cc3c184af1ae Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Sat, 11 Oct 2025 14:03:44 +0800
Subject: [PATCH] =?UTF-8?q?10.11=20=E6=9F=A5=E8=AF=A2=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/cashMapper/CashRefundMapper.xml | 31 +++++++++++++---------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml
index 6100edd..a63b53e 100644
--- a/src/main/resources/cashMapper/CashRefundMapper.xml
+++ b/src/main/resources/cashMapper/CashRefundMapper.xml
@@ -114,23 +114,28 @@ status = #{status},
             bank_code,
             goods_name,
             good_num,
-            payment_currency,
-            payment_amount,
-            received_currency,
-            received_amount,
-            handling_charge,
-            received_market,
-            pay_type,
-            pay_time,
-            received_time,
             status,
             submitter_id,
-            voucher,
+            refund_reason,
+            refund_model,
+            executor,
+            refund_channels,
+            refund_currency,
+            refund_amount,
+            refund_time,
+            refund_remark,
+            refund_voucher,
             remark,
             reject_reason,
             create_time,
-            update_time
+            update_time,
+        a1.admin_name as submitterName,
+        a2.admin_name as auditName
         from cash_record_done
+
+
+        left join admin a1 on submitter_id = a1.id
+        left join admin a2 on audit_id = a2.id
         <where>
             <if test="status != null">
                 status = #{status}
@@ -153,8 +158,8 @@ status = #{status},
         <if test="goodsName != null and goodName.size>0">
             and goods_name = #{goodsName}
         </if>
-        <if test="paymentCurrency != null and paymentCurrency.size>0">
-            and payment_currency = #{paymentCurrency}
+        <if test="refundModel != null and refundModel.size>0">
+            and refundModel = #{refundModel}
         </if>
         <if test="payType != null">
             and pay_type = #{payType}