From b249877c2722250deeedb0c68bb68646fcea4017 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 17 十二月 2024 15:25:08 +0800
Subject: [PATCH] 1.系统参数配置
---
src/main/resources/mapper/payment/OrderMapper.xml | 33 ++++++---------------------------
1 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index fc86d17..2d3a5e8 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -68,7 +68,7 @@
and (oi.status = 'reduce' or oi.status = 'abnormal')
)
and q.transfer_id is null
- and q.status in ('COLLECTION', 'SEND')
+ and q.status in ('COLLECTION', 'SEND','RECEIVE')
</if>
<if test="condition.billId != null and condition.billId != ''">
AND q.bill_id = #{condition.billId}
@@ -174,7 +174,7 @@
and (oi.status = 'reduce' or oi.status = 'abnormal')
)
and q.transfer_id is null
- and q.status in ('COLLECTION', 'SEND')
+ and q.status in ('COLLECTION', 'SEND','RECEIVE')
</if>
<if test="condition.billId != null and condition.billId != ''">
AND q.bill_id = #{condition.billId}
@@ -203,13 +203,6 @@
and o.transfer_id is null
and o.status in ('COLLECTION','SEND')
)
--- AND exists(
--- select 1 from t_order_item oi
--- where oi.order_id = q.id
--- and oi.status in ('abnormal','reduce','lack','back')
--- )
--- and q.transfer_id is null
--- and q.status in ('COLLECTION', 'SEND')
</if>
<if test="condition.abnormalOrderStatus != null and condition.abnormalOrderStatus != '' and condition.abnormalOrderStatus == 'PROCESSED'">
@@ -225,20 +218,6 @@
and o.transfer_id is null
and o.status in ('COLLECTION','SEND')
)
--- AND exists(
--- select 1 from t_order_item oi
--- where oi.order_id = q.id
--- and oi.status in ('abnormal','reduce','lack','back')
--- )
--- AND not exists(
--- select 1 from t_order_item oi
--- where oi.order_id = q.id
--- and oi.status in ('abnormal','reduce','lack','back')
--- and q.transfer_id is null
--- and q.status in ('COLLECTION', 'SEND')
--- )
-
-
</if>
ORDER BY q.create_time desc, q.payment_time desc
@@ -431,7 +410,7 @@
and (oi.status = 'reduce' or oi.status = 'abnormal')
)
and q.transfer_id is null
- and q.status in ('COLLECTION', 'SEND')
+ and q.status in ('COLLECTION', 'SEND','RECEIVE')
</if>
<if test="condition.billId != null and condition.billId != ''">
AND q.bill_id = #{condition.billId}
@@ -531,7 +510,7 @@
and oi.status in ('abnormal','reduce','lack','back')
)
and q.transfer_id is null
- and q.status in ('COLLECTION', 'SEND')
+ and q.status in ('COLLECTION', 'SEND','RECEIVE')
union
@@ -550,7 +529,7 @@
where oi.order_id = q.id
and oi.status in ('abnormal','reduce','lack','back')
and q.transfer_id is null
- and q.status in ('COLLECTION', 'SEND')
+ and q.status in ('COLLECTION', 'SEND','RECEIVE')
)
</select>
@@ -607,7 +586,7 @@
<!-- and (oi.status = 'reduce' or oi.status = 'abnormal')-->
<!-- )-->
<!-- and q.transfer_id is null-->
-<!-- and q.status in ('COLLECTION', 'SEND')-->
+<!-- and q.status in ('COLLECTION', 'SEND','RECEIVE')-->
<!-- </if>-->
<if test="condition.billId != null and condition.billId != ''">
AND q.bill_id = #{condition.billId}
--
Gitblit v1.9.3