From 9bb9952db0b22034b4aea1f486df827d77a03031 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 17 十月 2024 14:41:35 +0800
Subject: [PATCH] add:销售合计统计运费+打包费;售后扣平台款字段，增加增加统计售后“打包运费（散户）”字段
---
src/main/resources/mapper/payment/DeliveryOrderMapper.xml | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/payment/DeliveryOrderMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
index f6d68af..243e5d8 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
@@ -188,6 +188,22 @@
</select>
<select id="statisticStationList" resultType="com.mzl.flower.dto.response.flower.StationStatisticDTO">
+ select tt.*
+ , (select count(distinct s.id)
+ from t_supplier_info s
+ join t_delivery_order q on s.id = q.supplier_id
+ WHERE q.deleted = 0
+ and q.status in ('CHECKED')
+ AND s.station_id = tt.stationId
+ ) checkedSupplierCount
+ , (select count(distinct s.id)
+ from t_supplier_info s
+ join t_delivery_order q on s.id = q.supplier_id
+ WHERE q.deleted = 0
+ and q.status in ('PENDING', 'ARRIVED')
+ AND s.station_id = tt.stationId
+ ) uncheckedSupplierCount
+ from (
SELECT
s.station_id AS stationId,
st.`name`,
@@ -218,10 +234,15 @@
<if test="endDate != null">
AND o.create_time <= #{endDate}
</if>
- GROUP BY
- s.station_id,
- st.`name`;
+ <if test="statusList != null and statusList.size > 0">
+ AND o.status in
+ <foreach collection="statusList" item="status" open="(" separator="," close=")">
+ #{status}
+ </foreach>
+ </if>
+ GROUP BY s.station_id, st.`name`
+ ) tt
</select>
<update id="setDeliveryOrderPending">
--
Gitblit v1.9.3