diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml
index 68f5f6c..54b0293 100644
--- a/src/main/resources/cashMapper/CashRefundMapper.xml
+++ b/src/main/resources/cashMapper/CashRefundMapper.xml
@@ -513,12 +513,22 @@
#{statuses}
-
- AND (
-
- (crc.received_market = #{item.areaId,jdbcType=INTEGER} AND crc.pay_type = #{item.payType,jdbcType=VARCHAR})
+
+
+
+
+
+
- )
+
+ AND (
+
+
+ (crc.received_market = #{item.areaId,jdbcType=INTEGER} AND crc.pay_type = #{item.payType,jdbcType=VARCHAR})
+
+
+ )
+
UNION ALL
@@ -554,7 +564,7 @@
FROM cash_record_refund crr
INNER JOIN cash_record_collection crc ON crr.related_id = crc.id
left join recharge_activity ra on ra.id = crc.activity
- WHERE crc.status =6 and crr.status =41
+ WHERE crr.status =41
and crc.jwcode = #{jwcode}
@@ -564,6 +574,12 @@
#{markets}
+
+ and crc.status IN
+
+ #{statuses}
+
+
AND crc.performance_market IN
@@ -582,12 +598,22 @@
AND crc.order_code like CONCAT('%', #{orderCode}, '%')
-
- AND (
-
- (crc.received_market = #{item.areaId,jdbcType=INTEGER} AND crc.pay_type = #{item.payType,jdbcType=VARCHAR})
+
+
+
+
+
+
- )
+
+ AND (
+
+
+ (crc.received_market = #{item.areaId,jdbcType=INTEGER} AND crc.pay_type = #{item.payType,jdbcType=VARCHAR})
+
+
+ )
+
) AS combined_result
ORDER BY