From 263a13a155ec759b1cb26cc00edd640f4d2e747c Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 19 九月 2024 16:46:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index 845827f..0de6831 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -16,6 +16,9 @@
<select id="selectDoItemCheckList" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemCheckDTO">
SELECT oi.id, oi.flower_name, oi.flower_unit, oi.flower_color, oi.flower_cover, oi.num
, oi.supplier_price price, oi.flower_level, oi.status, oi.check_images, oi.check_time, oi.check_remarks
+ , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'replace') replaceNum
+ , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'reduce') reduceNum
+ , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack') lackNum
FROM t_delivery_order_item q
join t_order_item oi on oi.id = q.order_item_id
WHERE q.deleted = 0 and oi.deleted = 0
@@ -23,7 +26,7 @@
</select>
<select id="selectDoItemListByTime" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemStatisticsDTO">
- SELECT oi.flower_name, oi.flower_level, sum(oi.num) num, sum(oi.supplier_price) price
+ SELECT oi.flower_name, oi.flower_level, sum(oi.num) num, sum(oi.supplier_price*oi.num) price
FROM t_delivery_order_item doi
join t_delivery_order q on q.id = doi.delivery_id
join t_order_item oi on oi.id = doi.order_item_id
@@ -39,13 +42,16 @@
</select>
<select id="selectSettlementListByTime" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemSettlementDTO">
- SELECT oi.flower_name, oi.flower_level, oi.num, oi.supplier_price price
- , s.`status`, sd.check_fee, sd.station_fee, sd.sales_fee, s.service_fee_rate
- , o.status_backend, o.create_time orderTime
+ SELECT ois.order_item_id, oi.flower_name, oi.flower_level, oi.num, oi.supplier_price price , s.`status`
+ , ois.check_num, ois.check_fee, ois.replace_num, ois.replace_fee, ois.lack_num, ois.lack_fee_supplier lackFee
+ , ois.station_fee, ois.sales_fee_supplier salesFee, ois.service_fee_rate, ois.service_fee
+ , ois.income_supplier income, o.status_backend, o.create_time orderTime, o.receive_time, o.order_no
+ , (select count(1) from t_order_item_sales sa where sa.order_item_id = oi.id) salesNum
FROM t_delivery_order_item doi
join t_delivery_order q on q.id = doi.delivery_id
join t_order o on o.id = q.order_id
join t_order_item oi on oi.id = doi.order_item_id
+ left join t_order_item_settlement ois on ois.order_item_id = oi.id
left join t_order_settlement_detail sd on sd.order_item_id = oi.id
left join t_order_settlement s on sd.settlement_id = s.id
WHERE q.deleted = 0 and doi.deleted = 0
@@ -60,7 +66,7 @@
</select>
<select id="getSupplierStatisticsByTime" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemStatisticsDTO">
- SELECT sum(oi.num) num, sum(oi.supplier_price) price
+ SELECT sum(oi.num) num, sum(oi.supplier_price*oi.num) price
FROM t_delivery_order_item doi
join t_delivery_order q on q.id = doi.delivery_id
join t_order_item oi on oi.id = doi.order_item_id
@@ -95,9 +101,18 @@
<select id="selectDoItemList4Check" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItem4CheckDTO">
SELECT oi.id, q.delivery_id, oi.flower_name, oi.flower_unit, oi.flower_color
, oi.flower_cover, oi.num , oi.supplier_price price, oi.flower_level, oi.status
- , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'replace') replaceNum
- , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'reduce') reduceNum
- , (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack') lackNum
+ , (select oic.num from t_order_item_check oic
+ where oic.order_item_id = oi.id and oic.type = 'replace'
+ and (oic.audit_status = 'AGREED' or oic.audit_status is null)
+ ) replaceNum
+ , (select oic.num from t_order_item_check oic
+ where oic.order_item_id = oi.id and oic.type = 'reduce'
+ and (oic.audit_status = 'AGREED' or oic.audit_status is null)
+ ) reduceNum
+ , (select oic.num from t_order_item_check oic
+ where oic.order_item_id = oi.id and oic.type = 'lack'
+ and (oic.audit_status = 'AGREED' or oic.audit_status is null)
+ ) lackNum
FROM t_delivery_order_item q
join t_order_item oi on oi.id = q.order_item_id
WHERE q.deleted = 0 and oi.deleted = 0
@@ -106,4 +121,13 @@
#{item}
</foreach>
</select>
+
+ <select id="getUnCheckCount" resultType="java.lang.Integer">
+ SELECT count(1)
+ FROM t_delivery_order_item doi
+ join t_order_item oi on oi.id = doi.order_item_id
+ WHERE oi.deleted = 0 and doi.deleted = 0
+ and oi.status is null
+ and doi.delivery_id = #{deliveryId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3