From 118623071a97b66f21c29e2bc02b8f15855ede5d Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期三, 25 九月 2024 19:54:11 +0800
Subject: [PATCH] 均价计算 优化
---
src/main/resources/mapper/payment/OrderMapper.xml | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index c0be05f..4d7d43a 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -90,6 +90,10 @@
<if test="condition.customerAddress != null and condition.customerAddress != ''">
AND q.customer_address LIKE concat('%', #{condition.customerAddress},'%')
</if>
+ <if test="condition.address != null and condition.address != ''">
+ AND CONCAT(q.customer_province, q.customer_city, q.customer_region, q.customer_address) LIKE concat('%',
+ #{condition.address},'%')
+ </if>
<if test="condition.customer != null and condition.customer != ''">
AND (q.customer LIKE concat('%', #{condition.customer},'%')
or q.customer_tel LIKE concat('%', #{condition.customer},'%')
@@ -129,6 +133,7 @@
and (oi.status = 'reduce' or oi.status = 'abnormal')
)
and q.transfer_id is null
+ and q.status in ('COLLECTION', 'SEND')
</if>
<if test="condition.billId != null and condition.billId != ''">
AND q.bill_id = #{condition.billId}
@@ -139,6 +144,9 @@
where oi.order_id = q.id
and oi.flower_name LIKE concat('%', #{condition.flowerName},'%')
)
+ </if>
+ <if test="condition.warehouseLocationCode != null and condition.warehouseLocationCode != ''">
+ AND q.warehouse_location_code LIKE concat('%', #{condition.warehouseLocationCode},'%')
</if>
ORDER BY q.create_time desc, q.payment_time desc
@@ -240,4 +248,31 @@
and o.receive_time < #{endTime}
and o.bill_id is null
</select>
+
+ <select id="getUserLastOrder" resultType="com.mzl.flower.entity.payment.Order">
+ select o.*
+ from t_order o
+ where o.receive_time is not null
+ AND o.create_by = #{userId}
+ order by o.receive_time desc
+ limit 1
+ </select>
+
+ <select id="getPointGoodsList" resultType="com.mzl.flower.dto.response.payment.OrderPointGoodsListDTO">
+ select gr.*
+ from t_point_goods_record gr
+ join t_order_point_goods opg on opg.goods_record_id = gr.id
+ where opg.order_id = #{orderId}
+ </select>
+ <select id="getFlowerCompleteNumWithinTimeRange" resultType="java.lang.Integer">
+ select IFNULL(sum(oi.num),0) as complete_num
+ from t_order o
+ left join t_order_item oi
+ on o.id=oi.order_id
+ where o.DELETEd=0 and oi.DELETEd=0
+ and o.status_backend not in ('PENDING','CANCEL','REFUND')
+ and o.create_by=#{userId}
+ AND oi.flower_id=#{flowerId}
+ AND o.payment_time BETWEEN #{startTime} AND #{endTime}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3