From f85651f863363b7f494f421301de9d02e0ae79ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 11 十一月 2024 12:49:33 +0800
Subject: [PATCH] fix:调整花农结算报表订单状态；查询时间无效

---
 src/main/resources/mapper/payment/OrderMapper.xml |   74 +++++++++++++++++++++++++------------
 1 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 17f9cde..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 &gt;= #{condition.startDate}
-        </if>
-        <if test="condition.endDate != null">
-            AND q.payment_time &lt;= #{condition.endDate}
-        </if>
+<!--        <if test="condition.startDate != null">-->
+<!--            AND q.payment_time &gt;= #{condition.startDate}-->
+<!--        </if>-->
+<!--        <if test="condition.endDate != null">-->
+<!--            AND q.payment_time &lt;= #{condition.endDate}-->
+<!--        </if>-->
+<!--        <if test="condition.createStartDate != null">-->
+<!--            AND q.create_time &gt;= #{condition.createStartDate}-->
+<!--        </if>-->
+<!--        <if test="condition.createEndDate != null">-->
+<!--            AND q.create_time &lt;= #{condition.createEndDate}-->
+<!--        </if>-->
         <if test="condition.createStartDate != null">
-            AND q.create_time &gt;= #{condition.createStartDate}
+            AND q.payment_time &gt;= #{condition.createStartDate}
         </if>
         <if test="condition.createEndDate != null">
-            AND q.create_time &lt;= #{condition.createEndDate}
+            AND q.payment_time &lt;= #{condition.createEndDate}
         </if>
         <if test="condition.partnerId != null">
             AND q.partner_id = #{condition.partnerId}
@@ -108,17 +114,24 @@
         <if test="condition.statusBackend != null and condition.statusBackend != ''">
             AND q.status_backend = #{condition.statusBackend}
         </if>
-        <if test="condition.startDate != null">
-            AND q.payment_time &gt;= #{condition.startDate}
-        </if>
-        <if test="condition.endDate != null">
-            AND q.payment_time &lt;= #{condition.endDate}
-        </if>
+<!--        <if test="condition.startDate != null">-->
+<!--            AND q.payment_time &gt;= #{condition.startDate}-->
+<!--        </if>-->
+<!--        <if test="condition.endDate != null">-->
+<!--            AND q.payment_time &lt;= #{condition.endDate}-->
+<!--        </if>-->
+<!--        <if test="condition.createStartDate != null">-->
+<!--            AND q.create_time &gt;= #{condition.createStartDate}-->
+<!--        </if>-->
+<!--        <if test="condition.createEndDate != null">-->
+<!--            AND q.create_time &lt;= #{condition.createEndDate}-->
+<!--        </if>-->
+        <!-- 修改查询日期对应的的创建时间为支付时间 2024-10-12-->
         <if test="condition.createStartDate != null">
-            AND q.create_time &gt;= #{condition.createStartDate}
+            AND q.payment_time  &gt;= #{condition.createStartDate}
         </if>
         <if test="condition.createEndDate != null">
-            AND q.create_time &lt;= #{condition.createEndDate}
+            AND q.payment_time &lt;= #{condition.createEndDate}
         </if>
         <if test="condition.partnerId != null">
             AND q.partner_id = #{condition.partnerId}
@@ -176,18 +189,18 @@
         <if test="condition.statusBackend != null and condition.statusBackend != ''">
             AND q.status_backend = #{condition.statusBackend}
         </if>
-        <if test="condition.startDate != null">
-            AND q.payment_time &gt;= #{condition.startDate}
-        </if>
-        <if test="condition.endDate != null">
-            AND q.payment_time &lt;= #{condition.endDate}
-        </if>
         <if test="condition.createStartDate != null">
-            AND q.create_time &gt;= #{condition.createStartDate}
+            AND q.payment_time &gt;= #{condition.createStartDate}
         </if>
         <if test="condition.createEndDate != null">
-            AND q.create_time &lt;= #{condition.createEndDate}
+            AND q.payment_time &lt;= #{condition.createEndDate}
         </if>
+<!--        <if test="condition.createStartDate != null">-->
+<!--            AND q.create_time &gt;= #{condition.createStartDate}-->
+<!--        </if>-->
+<!--        <if test="condition.createEndDate != null">-->
+<!--            AND q.create_time &lt;= #{condition.createEndDate}-->
+<!--        </if>-->
         <if test="condition.partnerId != null">
             AND q.partner_id = #{condition.partnerId}
         </if>
@@ -355,4 +368,17 @@
         </if>
         ORDER BY q.create_time desc, q.payment_time desc
     </select>
+
+    <select id="getOrderSaleAmount" resultType="java.math.BigDecimal">
+        SELECT sum(o.payment_amount)
+        FROM t_order o
+        WHERE o.payment_time is not null
+        and o.refund_time is null
+        <if test="startTime != null">
+            and o.create_time &gt; #{startTime}
+        </if>
+        <if test="endTime != null">
+            and o.create_time &lt;= #{endTime}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3