From 63607e10ec3f4a7d6264a52c3e783a98be68368d Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期日, 10 十一月 2024 00:29:32 +0800
Subject: [PATCH] 1.payment_time update
---
src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml | 33 +++++++++++++---
src/main/resources/mapper/payment/DeliveryOrderMapper.xml | 40 ++++++++++++++++----
src/main/resources/mapper/payment/OrderMapper.xml | 34 ++++++++++-------
3 files changed, 79 insertions(+), 28 deletions(-)
diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index df08bcb..54a0077 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -31,13 +31,20 @@
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
+ JOIN t_order o ON q.order_id = o.id
WHERE q.deleted = 0 and doi.deleted = 0
and q.supplier_id = #{supplierId}
+<!-- <if test="startDate != null">-->
+<!-- AND q.create_time > #{startDate}-->
+<!-- </if>-->
+<!-- <if test="endDate != null">-->
+<!-- AND q.create_time <= #{endDate}-->
+<!-- </if>-->
<if test="startDate != null">
- AND q.create_time > #{startDate}
+ AND o.payment_time > #{startDate}
</if>
<if test="endDate != null">
- AND q.create_time <= #{endDate}
+ AND o.payment_time <= #{endDate}
</if>
group by oi.flower_name, oi.flower_level
</select>
@@ -74,13 +81,20 @@
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
+ JOIN t_order o on oi.order_id=o.id
WHERE q.deleted = 0 and doi.deleted = 0
and q.supplier_id = #{supplierId}
+<!-- <if test="startDate != null">-->
+<!-- AND q.create_time > #{startDate}-->
+<!-- </if>-->
+<!-- <if test="endDate != null">-->
+<!-- AND q.create_time <= #{endDate}-->
+<!-- </if>-->
<if test="startDate != null">
- AND q.create_time > #{startDate}
+ AND o.payment_time > #{startDate}
</if>
<if test="endDate != null">
- AND q.create_time <= #{endDate}
+ AND o.payment_time <= #{endDate}
</if>
</select>
@@ -89,16 +103,23 @@
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
+ JOIN t_order o on oi.order_id=o.id
WHERE q.deleted = 0 and doi.deleted = 0
and q.supplier_id = #{supplierId}
+<!-- <if test="status != null and status != ''">-->
+<!-- AND q.status = #{status}-->
+<!-- </if>-->
+<!-- <if test="startDate != null">-->
+<!-- AND q.create_time > #{startDate}-->
+<!-- </if>-->
<if test="status != null and status != ''">
AND q.status = #{status}
</if>
<if test="startDate != null">
- AND q.create_time > #{startDate}
+ AND o.payment_time > #{startDate}
</if>
<if test="endDate != null">
- AND q.create_time <= #{endDate}
+ AND o.payment_time <= #{endDate}
</if>
</select>
diff --git a/src/main/resources/mapper/payment/DeliveryOrderMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
index 7af2ae0..e679dc7 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
@@ -17,11 +17,17 @@
#{item}
</foreach>
</if>
+<!-- <if test="condition.startDate != null">-->
+<!-- AND q.create_time > #{condition.startDate}-->
+<!-- </if>-->
+<!-- <if test="condition.endDate != null">-->
+<!-- AND q.create_time <= #{condition.endDate}-->
+<!-- </if>-->
<if test="condition.startDate != null">
- AND q.create_time > #{condition.startDate}
+ AND o.payment_time > #{condition.startDate}
</if>
<if test="condition.endDate != null">
- AND q.create_time <= #{condition.endDate}
+ AND o.payment_time <= #{condition.endDate}
</if>
ORDER BY o.payment_time
</select>
@@ -130,11 +136,17 @@
AND o.warehouse_location_code LIKE concat('%', #{condition.warehouseLocationCode},'%')
</if>
+<!-- <if test="condition.startDate != null">-->
+<!-- AND q.create_time > #{condition.startDate}-->
+<!-- </if>-->
+<!-- <if test="condition.endDate != null">-->
+<!-- AND q.create_time <= #{condition.endDate}-->
+<!-- </if>-->
<if test="condition.startDate != null">
- AND q.create_time > #{condition.startDate}
+ AND o.payment_time > #{condition.startDate}
</if>
<if test="condition.endDate != null">
- AND q.create_time <= #{condition.endDate}
+ AND o.payment_time <= #{condition.endDate}
</if>
) tt
GROUP BY tt.id, tt.supplierName, tt.supplierTel, tt.stationName
@@ -177,11 +189,17 @@
AND o.warehouse_location_code LIKE concat('%', #{condition.warehouseLocationCode},'%')
</if>
+<!-- <if test="condition.startDate != null">-->
+<!-- AND q.create_time > #{condition.startDate}-->
+<!-- </if>-->
+<!-- <if test="condition.endDate != null">-->
+<!-- AND q.create_time <= #{condition.endDate}-->
+<!-- </if>-->
<if test="condition.startDate != null">
- AND q.create_time > #{condition.startDate}
+ AND o.payment_time > #{condition.startDate}
</if>
<if test="condition.endDate != null">
- AND q.create_time <= #{condition.endDate}
+ AND o.payment_time <= #{condition.endDate}
</if>
ORDER BY q.arrive_time
@@ -213,11 +231,17 @@
t.warehouse_location_code LIKE concat('%', #{name},'%')
)
</if>
+<!-- <if test="startDate != null">-->
+<!-- AND o.create_time > #{startDate}-->
+<!-- </if>-->
+<!-- <if test="endDate != null">-->
+<!-- AND o.create_time <= #{endDate}-->
+<!-- </if>-->
<if test="startDate != null">
- AND o.create_time > #{startDate}
+ AND t.payment_time > #{startDate}
</if>
<if test="endDate != null">
- AND o.create_time <= #{endDate}
+ AND t.payment_time <= #{endDate}
</if>
<if test="statusList != null and statusList.size > 0">
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 6a3fc18..de52af6 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -35,17 +35,23 @@
<if test="condition.statusBackend != null and condition.statusBackend != ''">
AND q.status_backend = #{condition.statusBackend}
</if>
- <if test="condition.startDate != null">
- AND q.payment_time >= #{condition.startDate}
- </if>
- <if test="condition.endDate != null">
- AND q.payment_time <= #{condition.endDate}
- </if>
+<!-- <if test="condition.startDate != null">-->
+<!-- AND q.payment_time >= #{condition.startDate}-->
+<!-- </if>-->
+<!-- <if test="condition.endDate != null">-->
+<!-- AND q.payment_time <= #{condition.endDate}-->
+<!-- </if>-->
+<!-- <if test="condition.createStartDate != null">-->
+<!-- AND q.create_time >= #{condition.createStartDate}-->
+<!-- </if>-->
+<!-- <if test="condition.createEndDate != null">-->
+<!-- AND q.create_time <= #{condition.createEndDate}-->
+<!-- </if>-->
<if test="condition.createStartDate != null">
- AND q.create_time >= #{condition.createStartDate}
+ AND q.payment_time >= #{condition.createStartDate}
</if>
<if test="condition.createEndDate != null">
- AND q.create_time <= #{condition.createEndDate}
+ AND q.payment_time <= #{condition.createEndDate}
</if>
<if test="condition.partnerId != null">
AND q.partner_id = #{condition.partnerId}
@@ -108,12 +114,12 @@
<if test="condition.statusBackend != null and condition.statusBackend != ''">
AND q.status_backend = #{condition.statusBackend}
</if>
- <if test="condition.startDate != null">
- AND q.payment_time >= #{condition.startDate}
- </if>
- <if test="condition.endDate != null">
- AND q.payment_time <= #{condition.endDate}
- </if>
+<!-- <if test="condition.startDate != null">-->
+<!-- AND q.payment_time >= #{condition.startDate}-->
+<!-- </if>-->
+<!-- <if test="condition.endDate != null">-->
+<!-- AND q.payment_time <= #{condition.endDate}-->
+<!-- </if>-->
<!-- <if test="condition.createStartDate != null">-->
<!-- AND q.create_time >= #{condition.createStartDate}-->
<!-- </if>-->
--
Gitblit v1.9.3