From 99f77afaaee87c3b9d7a5e48862908b72a947f7b Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 17 一月 2025 08:59:55 +0800
Subject: [PATCH] fix:修改密码
---
src/main/resources/mapper/payment/OrderMapper.xml | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 4e4a2ab..2a87af2 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}
@@ -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>
@@ -348,7 +348,7 @@
</select>
<select id="selectOrderExportList" resultType="com.mzl.flower.dto.response.payment.OrderListExportDTO">
- SELECT q.order_no,q.create_time,q.customer,q.customer_tel,q.total_amount,q.status_backend,q.partner_name,q.warehouse_location_code,q.remarks,
+ SELECT q.order_no,q.create_time,q.customer,q.customer_tel,q.total_amount,q.status_backend,q.partner_name,q.warehouse_location_code,q.remarks,q.logistics_company_code,
u.nick_name createName ,
code.label as statusBackendStr,
code2.label as specialNeedsStr,
@@ -410,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}
@@ -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>
@@ -510,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
@@ -529,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>
@@ -586,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