From 29a8eeb43120d2019032f303bc9262308abb611b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Sep 2022 14:39:41 +0800
Subject: [PATCH] 20220902
---
src/main/resources/mapper/modules/MallTeamLeaderMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
index 963961c..fb44d2b 100644
--- a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
+++ b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
@@ -74,6 +74,7 @@
<result column="carriage" property="carriage" />
<result column="remark" property="remark" />
<result column="del_flag" property="delFlag" />
+ <result column="is_home" property="isHome" />
<collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
<id property="id" column="item_id" />
<result property="orderId" column="order_id" />
@@ -87,6 +88,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 +103,7 @@
b.style_name,
b.sku_name,
b.sku_image,
+ b.state,
b.cnt,
b.price,
b.amount
@@ -108,8 +111,7 @@
inner join mall_order_item b on a.id=b.order_id
inner join mall_member c on a.take_unique_code=c.invite_id
<where>
- a.del_flag=2
- and a.delivery_type = 1
+ a.delivery_type = 1
and c.id=#{record.memberId}
<if test="record.query != null and record.query != ''">
and ( a.name like CONCAT('%', CONCAT(#{record.query}, '%'))
@@ -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