From 7a5095c394467dacd285009ab88ccf46efcc4732 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 04 十一月 2024 09:50:11 +0800
Subject: [PATCH] add: 还原支付版本到微信

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

diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 17f9cde..5e6e22a 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -114,11 +114,18 @@
         <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}
@@ -355,4 +362,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