From a3fbc3990b6bfb39aacc7edad459a762628526ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 30 八月 2024 18:42:08 +0800
Subject: [PATCH] fix：会员保存空指针
---
src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index 82f2983..96ba750 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
@@ -62,7 +65,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
@@ -108,4 +111,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