From d390d8f502436eaa17ee8ca7abd3c3f8a11a8514 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 12 十月 2024 13:43:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/resources/mapper/payment/OrderItemSalesMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
index 1cabdc5..207a856 100644
--- a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
+++ b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
@@ -71,12 +71,16 @@
, oi.flower_level, oi.flower_category, o.customer, o.customer_tel, o.customer_province, o.customer_city
, o.customer_region, o.customer_address, oi.num flowerNum, oi.supplier_name, oi.price, oi.total
, o.order_no, si.sales_no, si.title, si.num, si.reason, si.total_fee, si.status, si.create_time
- , si.remarks, oi.supplier_price, oi.markup_partner, si.audit_time
+ , si.remarks, oi.supplier_price, oi.markup_partner, si.audit_time,si.sales_type, oi.real_price, oi.real_total
FROM t_order_item_sales si
join t_order_item oi on oi.id = si.order_item_id
join t_order o on si.order_id = o.id
left join t_station s on s.id = oi.station_id
WHERE oi.deleted = 0
+ <if test="condition.orderItemId != null and condition.orderItemId != ''">
+ AND si.order_item_id = #{condition.orderItemId}
+ </if>
+
<if test="condition.orderId != null and condition.orderId != ''">
AND si.order_id = #{condition.orderId}
</if>
@@ -132,12 +136,18 @@
<if test="condition.supplierId != null">
AND oi.supplier_id = #{condition.supplierId}
</if>
+ <if test="condition.supplierId != null">
+ AND oi.supplier_id = #{condition.supplierId}
+ </if>
+ <if test="condition.salesType != null">
+ AND si.sales_type = #{condition.salesType}
+ </if>
ORDER BY si.create_time desc
</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
@@ -145,7 +155,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