From 0139f95436555c61413c5c2dcf99858a5b48dbb7 Mon Sep 17 00:00:00 2001
From: wangguorui <2069821375@qq.com>
Date: Wed, 8 Apr 2026 14:44:23 +0800
Subject: [PATCH] =?UTF-8?q?20260408=20=E9=80=80=E6=AC=BE=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=9A=84=E9=80=80=E6=AC=BE=E5=B8=81=E7=A7=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/cashMapper/CashRefundMapper.xml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml
index f4f269c..daa938f 100644
--- a/src/main/resources/cashMapper/CashRefundMapper.xml
+++ b/src/main/resources/cashMapper/CashRefundMapper.xml
@@ -336,7 +336,7 @@
         crc.good_num as goodsNum,
         crc.num_unit,
         crr.refund_model,
-        crr.refund_currency,
+        r.rate_name as refund_currency,
         crr.refund_amount,
         crr.refund_channels,
         crr.refund_voucher,
@@ -349,13 +349,14 @@
         crr.submitter_id,
         crr.related_id,
         crr.refund_reason,
-       la.area_servise,
-       la.area_finance,
-       la.area_charge,
-       la.head_finance
-    from cash_record_refund crr
-     left join cash_record_collection crc on crc.id = crr.related_id
-     left join lhl_audit la on la.id = crr.audit_id
+        la.area_servise,
+        la.area_finance,
+        la.area_charge,
+        la.head_finance
+        from cash_record_refund crr
+        left join cash_record_collection crc on crc.id = crr.related_id
+        left join lhl_audit la on la.id = crr.audit_id
+        left join rate r on r.id = crr.refund_currency
         <where>
             <if test="status != null">
                 and crr.status = #{status}
@@ -387,7 +388,7 @@
                 )
             </if>
             <if test="refundCurrency != null and refundCurrency.length() > 0">
-                AND crr.refund_currency like CONCAT('%', #{refundCurrency}, '%')
+                AND r.rate_name like CONCAT('%', #{refundCurrency}, '%')
             </if>
             <if test="refundChannels != null and refundChannels.length()>0">
                 and crr.refund_channels like CONCAT('%', #{refundChannels}, '%')
@@ -435,13 +436,14 @@
                crr.remark,
                crr.reject_reason,
                crr.refund_model,
-               crr.refund_currency,
+               r.rate_name as refund_currency,
                crr.refund_amount,
                crr.refund_channels,
                crr.refund_time,
                crr.refund_remark,
                crr.refund_voucher
         from cash_record_refund crr
+                 left join rate r on r.id = crr.refund_currency
         where crr.id = #{id}
     </select>