From e45f2e2b0b1c8120c1ebf0bad5100688f7ece27c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 Jan 2023 13:39:42 +0800
Subject: [PATCH] 20221227 充值归集

---
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 9778498..29a0c53 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -151,6 +151,9 @@
             <if test="record.query != null and record.query != ''">
                 and (b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.style_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.sku_name like CONCAT('%', CONCAT(#{record.query}, '%')))
             </if>
+            <if test="record.status == 6 and record.status != 0">
+                and a.status = 4 and a.comment_state != 2
+            </if>
             <if test="record.status == 4 and record.status != 0">
                 and a.status = 4
             </if>
@@ -167,10 +170,10 @@
                 and a.order_type=#{record.orderType}
             </if>
             <if test="record.allStatus == 2">
-                and a.status <![CDATA[< ]]> 4
+                and a.status <![CDATA[<= ]]> 4 and a.comment_state != 2
             </if>
             <if test="record.allStatus == 3">
-                and a.status <![CDATA[>= ]]> 4
+                and a.status = 4 and a.comment_state = 2
             </if>
         </where>
         order by a.created_time desc
@@ -243,7 +246,9 @@
 
     <select id="selectTotalAmount" resultType="java.math.BigDecimal">
         select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
-        where member_id=#{memberId} and status <![CDATA[>= ]]> 4
+        where member_id=#{memberId}
+          and status = 4
+          and comment_state = 2
     </select>
 
     <select id="selectTotalAmountForDate" resultType="java.math.BigDecimal">
@@ -323,7 +328,8 @@
             count(a.id)
         from mall_order_info a
         where
-              a.status <![CDATA[>= ]]> 4
+              a.status = 4
+            and a.comment_state = 2
             and a.member_id = #{memberId}
             <if test="createdTime != null">
                 and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}
@@ -336,7 +342,8 @@
                 ifnull(sum(a.subsidy_amount),0)
             from mall_order_info a
             where
-                  a.status <![CDATA[>= ]]> 4
+                  a.status = 4
+                and a.comment_state = 2
                 and a.member_id = #{memberId}
             <if test="createdTime != null">
                 and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}

--
Gitblit v1.9.1