From 52b31d09cd0270e2b488b82da39ebdf4ade3d3f3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Sep 2022 16:48:55 +0800
Subject: [PATCH] 20220902

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

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 4d2a513..226f2f1 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -85,6 +85,9 @@
                 <if test="record.deliveryType != null and record.deliveryType != ''">
                     and a.delivery_type = #{record.deliveryType}
                 </if>
+                <if test="record.isHome != null and record.isHome != ''">
+                    and a.is_home = #{record.isHome}
+                </if>
                 <if test="record.orderNo != null and record.orderNo != ''">
                     and a.order_no like CONCAT('%', CONCAT(#{record.orderNo}, '%'))
                 </if>
@@ -192,8 +195,8 @@
          inner join mall_team_leader c on a.take_unique_code=c.unique_code
         <where>
             a.del_flag=2
-            <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 test="record.memberId != null">
+                and a.member_id=#{record.memberId}
             </if>
             <if test="record.status == 4 and record.status != 0">
                 and a.status = 4
@@ -204,8 +207,8 @@
             <if test="record.status == 5">
                 and a.status = 7 or b.state in (2,3)
             </if>
-            <if test="record.memberId != null">
-                and a.member_id=#{record.memberId}
+            <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.orderType != null">
                 and a.order_type=#{record.orderType}

--
Gitblit v1.9.1