From d94e7d6bbf23698c27147a60ee866c64b2d43775 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/resources/mapper/payment/OrderItemMapper.xml | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderItemMapper.xml b/src/main/resources/mapper/payment/OrderItemMapper.xml
index c637e25..e32d4cf 100644
--- a/src/main/resources/mapper/payment/OrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/OrderItemMapper.xml
@@ -50,10 +50,39 @@
, (select oic.audit_status from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'reduce') reduceStatus
, (select oic.audit_status from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack') lackStatus
, (select count(1) from t_order_item_check oic where oic.order_item_id = oi.id and oic.audit_status is null) unProcessCount
+ , ois.lack_fee_supplier, ois.replace_fee, ois.check_fee
FROM t_order_item oi
left join t_station s on s.id = oi.station_id
left join t_supplier_info si on si.id = oi.supplier_id
+ left join t_order_item_settlement ois on ois.order_item_id = oi.id
WHERE oi.deleted = 0
and oi.order_id = #{orderId}
</select>
+
+ <select id="getOrderItems" resultType="com.mzl.flower.dto.response.payment.OrderItemListDTO">
+ SELECT oi.*
+ , (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') 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') 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') lackNum
+ FROM t_order_item oi
+ WHERE oi.deleted = 0
+ and oi.order_id in
+ <foreach collection="orderIds" item="orderId" open="(" separator="," close=")">
+ #{orderId}
+ </foreach>
+ </select>
+
+ <select id="getFlowerSaleNum" resultType="java.lang.Integer">
+ SELECT sum(oi.num)
+ FROM t_order_item oi
+ JOIN t_order o on oi.order_id = o.id
+ WHERE o.deleted=0
+ and o.status_backend not in ('PENDING','CANCEL','REFUND')
+ <if test="startTime != null">
+ and o.create_time > #{startTime}
+ </if>
+ <if test="endTime != null">
+ and o.create_time <= #{endTime}
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3