From f2728ef322de546ef885e21ea99183bfc7b18f24 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 09 十二月 2024 18:08:06 +0800
Subject: [PATCH] 1.payment_time > 17:00:00 为第二天
---
src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml | 16 ++++++++--------
src/main/resources/mapper/payment/DeliveryOrderMapper.xml | 16 ++++++++--------
src/main/resources/mapper/payment/OrderMapper.xml | 8 ++++----
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index 54a0077..4c89314 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -41,10 +41,10 @@
<!-- AND q.create_time <= #{endDate}-->
<!-- </if>-->
<if test="startDate != null">
- AND o.payment_time > #{startDate}
+ AND o.payment_time >= #{startDate}
</if>
<if test="endDate != null">
- AND o.payment_time <= #{endDate}
+ AND o.payment_time < #{endDate}
</if>
group by oi.flower_name, oi.flower_level
</select>
@@ -67,10 +67,10 @@
WHERE q.deleted = 0 and doi.deleted = 0
and q.supplier_id = #{supplierId}
<if test="startDate != null">
- AND o.payment_time > #{startDate}
+ AND o.payment_time >= #{startDate}
</if>
<if test="endDate != null">
- AND o.payment_time <= #{endDate}
+ AND o.payment_time < #{endDate}
</if>
order by q.create_time desc, oi.flower_name, oi.flower_level
</select>
@@ -91,10 +91,10 @@
<!-- AND q.create_time <= #{endDate}-->
<!-- </if>-->
<if test="startDate != null">
- AND o.payment_time > #{startDate}
+ AND o.payment_time >= #{startDate}
</if>
<if test="endDate != null">
- AND o.payment_time <= #{endDate}
+ AND o.payment_time < #{endDate}
</if>
</select>
@@ -116,10 +116,10 @@
AND q.status = #{status}
</if>
<if test="startDate != null">
- AND o.payment_time > #{startDate}
+ AND o.payment_time >= #{startDate}
</if>
<if test="endDate != null">
- AND o.payment_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 e679dc7..2a91ac6 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
@@ -24,10 +24,10 @@
<!-- AND q.create_time <= #{condition.endDate}-->
<!-- </if>-->
<if test="condition.startDate != null">
- AND o.payment_time > #{condition.startDate}
+ AND o.payment_time >= #{condition.startDate}
</if>
<if test="condition.endDate != null">
- AND o.payment_time <= #{condition.endDate}
+ AND o.payment_time < #{condition.endDate}
</if>
ORDER BY o.payment_time
</select>
@@ -143,10 +143,10 @@
<!-- AND q.create_time <= #{condition.endDate}-->
<!-- </if>-->
<if test="condition.startDate != null">
- AND o.payment_time > #{condition.startDate}
+ AND o.payment_time >= #{condition.startDate}
</if>
<if test="condition.endDate != null">
- AND o.payment_time <= #{condition.endDate}
+ AND o.payment_time < #{condition.endDate}
</if>
) tt
GROUP BY tt.id, tt.supplierName, tt.supplierTel, tt.stationName
@@ -196,10 +196,10 @@
<!-- AND q.create_time <= #{condition.endDate}-->
<!-- </if>-->
<if test="condition.startDate != null">
- AND o.payment_time > #{condition.startDate}
+ AND o.payment_time >= #{condition.startDate}
</if>
<if test="condition.endDate != null">
- AND o.payment_time <= #{condition.endDate}
+ AND o.payment_time < #{condition.endDate}
</if>
ORDER BY q.arrive_time
@@ -238,10 +238,10 @@
<!-- AND o.create_time <= #{endDate}-->
<!-- </if>-->
<if test="startDate != null">
- AND t.payment_time > #{startDate}
+ AND t.payment_time >= #{startDate}
</if>
<if test="endDate != null">
- AND t.payment_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 ebaac79..f7d5ee9 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -52,7 +52,7 @@
AND q.payment_time >= #{condition.createStartDate}
</if>
<if test="condition.createEndDate != null">
- AND q.payment_time <= #{condition.createEndDate}
+ AND q.payment_time < #{condition.createEndDate}
</if>
<if test="condition.partnerId != null">
AND q.partner_id = #{condition.partnerId}
@@ -132,7 +132,7 @@
AND q.payment_time >= #{condition.createStartDate}
</if>
<if test="condition.createEndDate != null">
- AND q.payment_time <= #{condition.createEndDate}
+ AND q.payment_time < #{condition.createEndDate}
</if>
<if test="condition.partnerId != null">
AND q.partner_id = #{condition.partnerId}
@@ -197,7 +197,7 @@
AND q.payment_time >= #{condition.createStartDate}
</if>
<if test="condition.createEndDate != null">
- AND q.payment_time <= #{condition.createEndDate}
+ AND q.payment_time < #{condition.createEndDate}
</if>
<!-- <if test="condition.createStartDate != null">-->
<!-- AND q.create_time >= #{condition.createStartDate}-->
@@ -335,7 +335,7 @@
AND q.payment_time >= #{condition.startDate}
</if>
<if test="condition.endDate != null">
- AND q.payment_time <= #{condition.endDate}
+ AND q.payment_time < #{condition.endDate}
</if>
<if test="condition.createStartDate != null">
AND q.create_time >= #{condition.createStartDate}
--
Gitblit v1.9.3