From 19612f8cd0963f8f3db5f0afa97d99a94047c0d7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 09 Jan 2023 10:16:10 +0800
Subject: [PATCH] 20221227 充值归集

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

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index e80890a..f573e79 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -152,12 +152,12 @@
                 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 = 1
+                and a.status = 4 and a.comment_state = 2
             </if>
             <if test="record.status == 4 and record.status != 0">
-                and a.status = 4
+                and a.status = 4 and a.comment_state != 2
             </if>
-            <if test="record.status != 4 and record.status != 0 and record.status != 5">
+            <if test="record.status != 4 and record.status != 0 and record.status != 5 and record.status != 6">
                 and a.status = #{record.status}
             </if>
             <if test="record.status == 5">
@@ -170,7 +170,7 @@
                 and a.order_type=#{record.orderType}
             </if>
             <if test="record.allStatus == 2">
-                and a.status <![CDATA[< ]]> 4 and a.comment_state = 1
+                and a.status <![CDATA[<= ]]> 4 and a.comment_state != 2
             </if>
             <if test="record.allStatus == 3">
                 and a.status = 4 and a.comment_state = 2

--
Gitblit v1.9.1