From 832c911439b27f96596aff9d0e67ddc1e0ce2cf3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 29 Aug 2022 17:15:58 +0800
Subject: [PATCH] 20220822
---
src/main/resources/mapper/modules/MallTeamLeaderMapper.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
index b80a2d7..a563110 100644
--- a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
+++ b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
@@ -70,6 +70,7 @@
<result column="latitude" property="latitude" />
<result column="order_type" property="orderType" />
<result column="comment_state" property="commentState" />
+ <result column="delivery_state" property="deliveryState" />
<result column="carriage" property="carriage" />
<result column="remark" property="remark" />
<result column="del_flag" property="delFlag" />
@@ -123,10 +124,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}
@@ -146,7 +150,7 @@
select
a.*
from mall_team_leader a
- where a.unique_code = #{uniqueCode} limit 1
+ where a.unique_code = #{uniqueCode} and a.state = 1 limit 1
</select>
<select id="selectLeaderByLonAndLat" resultType="cc.mrbird.febs.mall.entity.MallTeamLeader">
@@ -166,4 +170,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