From eeb3b46afe7da500bce62daad35ded0886df3b88 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:31:12 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/resources/mapper/payment/OrderMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 2d3a5e8..2a87af2 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>
@@ -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,
@@ -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