From a710f1e57abece1ed7c38954f3f13c56fbe4eefe Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 01 Sep 2022 18:20:31 +0800
Subject: [PATCH] 20220822

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

diff --git a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
index 963961c..b687adf 100644
--- a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
+++ b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
@@ -87,6 +87,7 @@
             <result property="price" column="price" />
             <result property="amount" column="amount" />
             <result property="isNormal" column="is_normal" />
+            <result property="state" column="state" />
         </collection>
     </resultMap>
 
@@ -101,6 +102,7 @@
         b.style_name,
         b.sku_name,
         b.sku_image,
+        b.state,
         b.cnt,
         b.price,
         b.amount
@@ -124,10 +126,13 @@
                 and a.status = #{record.status}
             </if>
             <if test="record.status == 5">
-                and a.status = 7
+                and (a.status = 6 or b.state = 2)
             </if>
             <if test="record.status == 1">
                 and a.status = 2
+            </if>
+            <if test="record.status == 0">
+                and a.status in (2,3,4)
             </if>
             <if test="record.orderType != null">
                 and a.order_type=#{record.orderType}
@@ -167,4 +172,9 @@
         order by distance ASC limit 1
     </select>
 
+    <select id="selectleaderGoodsStockListInPage" resultType="cc.mrbird.febs.mall.entity.MallLeaderStock">
+        select a.* from mall_leader_stock a
+        where a.team_leader_id = #{record.teamLeaderId}
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1