From a02bed07c8281ae0fda850921eb7443393c5fb0c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期日, 29 十二月 2024 13:59:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/resources/mapper/payment/OrderItemSalesMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
index 6abf279..7fdb06b 100644
--- a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
+++ b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
@@ -123,8 +123,11 @@
AND si.create_time <= #{condition.salesEndDate}
</if>
- <if test="condition.status != null and condition.status != ''">
- AND si.status = #{condition.status}
+ <if test="condition.statusList != null and condition.statusList.size > 0">
+ AND si.status in
+ <foreach collection="condition.statusList" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</if>
<if test="condition.createBy != null and condition.createBy != ''">
@@ -147,7 +150,7 @@
</select>
<select id="getSupplierSalesCount" resultType="java.lang.Integer">
- SELECT count(1)
+ SELECT count(distinct si.order_id)
FROM t_order_item_sales si
join t_order_item oi on oi.id = si.order_item_id
WHERE oi.deleted = 0
@@ -155,7 +158,7 @@
</select>
<select id="getPartnerSalesCount" resultType="java.lang.Integer">
- SELECT count(1)
+ SELECT count(distinct si.order_id)
FROM t_order_item_sales si
join t_order o on si.order_id = o.id
WHERE o.deleted = 0
--
Gitblit v1.9.3