From dac27902e16f6348eb3495a5abb5e4729afdfdd2 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Sun, 25 Jan 2026 09:06:34 +0800
Subject: [PATCH] =?UTF-8?q?1.25=20=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java | 2 ++
 src/main/resources/cashMapper/CashRefundMapper.xml          | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java
index 8ba02ec..295f683 100644
--- a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java
+++ b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java
@@ -71,4 +71,6 @@ public class FundsDTO {
     private String sortField;
     @ExcelIgnore
     private String sortOrder;
+    @ExcelIgnore
+    private List<String> localMarket;
 }
diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml
index 100f3a2..a214a69 100644
--- a/src/main/resources/cashMapper/CashRefundMapper.xml
+++ b/src/main/resources/cashMapper/CashRefundMapper.xml
@@ -172,6 +172,9 @@
                     crc.pay_time,
                     crc.voucher,
                     crc.remark,
+                    crr.refund_reason,
+                    crr.refund_remark,
+                    crr.reject_reason,
                     crc.payment_currency,
                     crc.payment_amount
                 from cash_record_refund crr
@@ -450,6 +453,9 @@
                 #{markets}
             </foreach>
         </if>
+        <if test="localMarket != null and localMarket.size > 0">
+            and crc.market = #{localMarket}
+        </if>
         <if test="startTime != null and endTime != null">
             and crc.`pay_time` BETWEEN #{startTime} AND #{endTime}
         </if>