From 2e3d7f2d8611f50e7e9428725f4ed2a927f5b453 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 24 九月 2024 00:15:22 +0800
Subject: [PATCH] update 配送单打印
---
src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index b36955a..dc1b297 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -4,8 +4,8 @@
<select id="selectDoItemList" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemListDTO">
SELECT q.id, o.order_no, o.warehouse_name, o.warehouse_location_code
- , oi.flower_name, oi.flower_unit, oi.flower_color, oi.flower_cover, oi.num
- , oi.supplier_price price, oi.flower_level
+ , oi.flower_name, oi.flower_unit, oi.flower_color, oi.flower_cover, oi.num
+ , oi.supplier_price price, oi.flower_level
FROM t_delivery_order_item q
join t_order o on q.order_id = o.id
join t_order_item oi on oi.id = q.order_item_id
@@ -16,6 +16,10 @@
<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 +27,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.id,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
@@ -38,11 +42,13 @@
group by oi.flower_name, oi.flower_level
</select>
- <select id="selectSettlementListByTime" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemSettlementDTO">
+ <select id="selectSettlementListByTime"
+ resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemSettlementDTO">
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
- , o.status_backend, o.create_time orderTime
+ , 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
@@ -61,8 +67,9 @@
order by q.create_time desc
</select>
- <select id="getSupplierStatisticsByTime" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemStatisticsDTO">
- SELECT sum(oi.num) num, sum(oi.supplier_price) price
+ <select id="getSupplierStatisticsByTime"
+ resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemStatisticsDTO">
+ 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
@@ -97,9 +104,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
--
Gitblit v1.9.3