From d94e7d6bbf23698c27147a60ee866c64b2d43775 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4

---
 src/main/resources/mapper/payment/OrderItemMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/payment/OrderItemMapper.xml b/src/main/resources/mapper/payment/OrderItemMapper.xml
index 053f966..e32d4cf 100644
--- a/src/main/resources/mapper/payment/OrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/OrderItemMapper.xml
@@ -76,8 +76,8 @@
         SELECT sum(oi.num)
         FROM t_order_item oi
         JOIN t_order o on oi.order_id = o.id
-        WHERE o.payment_time is not null
-        and o.refund_time is null
+        WHERE o.deleted=0
+        and o.status_backend not in ('PENDING','CANCEL','REFUND')
         <if test="startTime != null">
             and o.create_time &gt; #{startTime}
         </if>

--
Gitblit v1.9.3