From c83b580b0f51a2cdf16f2b1537aa3cb113ef112f Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 20 十二月 2024 17:56:10 +0800
Subject: [PATCH] add: 花材销售统计商品分类

---
 src/main/resources/mapper/payment/OrderMapper.xml |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 4e4a2ab..08965d0 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>
 
@@ -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