From b9903ead016b8b1aa68eb04b48fca3b53fdab0d3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 30 十二月 2024 10:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/resources/mapper/payment/OrderMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 2d3a5e8..08965d0 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -201,7 +201,7 @@
on oi.order_id=o.id
where oi.status in ('abnormal','reduce','lack','back')
and o.transfer_id is null
- and o.status in ('COLLECTION','SEND')
+ and o.status in ('COLLECTION','SEND','RECEIVE')
)
</if>
@@ -216,7 +216,7 @@
on oi.order_id=o.id
where oi.status in ('abnormal','reduce','lack','back')
and o.transfer_id is null
- and o.status in ('COLLECTION','SEND')
+ and o.status in ('COLLECTION','SEND','RECEIVE')
)
</if>
@@ -471,7 +471,7 @@
on oi.order_id=o.id
where oi.status in ('abnormal','reduce','lack','back')
and o.transfer_id is null
- and o.status in ('COLLECTION','SEND')
+ and o.status in ('COLLECTION','SEND','RECEIVE')
)
union
@@ -491,7 +491,7 @@
on oi.order_id=o.id
where oi.status in ('abnormal','reduce','lack','back')
and o.transfer_id is null
- and o.status in ('COLLECTION','SEND')
+ and o.status in ('COLLECTION','SEND','RECEIVE')
)
</select>
--
Gitblit v1.9.3