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/MallTeamLeaderMapper.xml | 68 +++++++++++++++++++++++++++------
1 files changed, 55 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
index 57a9ccc..f95435a 100644
--- a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
+++ b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
@@ -22,6 +22,7 @@
<select id="selectApiLeaderListInPage" resultType="cc.mrbird.febs.mall.entity.MallTeamLeader">
select
a.*,
+ b.longlatiarr,
ROUND(
6378.138 * 2 * ASIN(
SQRT(
@@ -32,8 +33,9 @@
) * 1000
) AS distance
from mall_team_leader a
+ left join mall_electronic_fence b on b.team_leader_code = a.unique_code
<where>
- a.state = 1
+ a.state = 1 and a.online_state = 1
<if test="record.query != null and record.query != ''">
and (a.name like CONCAT('%', CONCAT(#{record.query}, '%'))
or a.phone like CONCAT('%', CONCAT(#{record.query}, '%'))
@@ -74,6 +76,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 +90,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 +105,7 @@
b.style_name,
b.sku_name,
b.sku_image,
+ b.state,
b.cnt,
b.price,
b.amount
@@ -108,15 +113,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
- and c.id=#{record.memberId}
- <if test="record.query != null and record.query != ''">
- and ( a.name like CONCAT('%', CONCAT(#{record.query}, '%'))
- or a.phone like CONCAT('%', CONCAT(#{record.query}, '%'))
- or a.take_code like CONCAT('%', CONCAT(#{record.query}, '%'))
- )
- </if>
+ c.id=#{record.memberId}
<if test="record.status == 4 and record.status != 0">
and a.status = 4
</if>
@@ -124,14 +121,25 @@
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.query != null and record.query != ''">
+ and ( a.name like CONCAT('%', CONCAT(#{record.query}, '%'))
+ or a.phone like CONCAT('%', CONCAT(#{record.query}, '%'))
+ or a.take_code like CONCAT('%', CONCAT(#{record.query}, '%'))
+ or b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%'))
+ )
+ </if>
<if test="record.orderType != null">
and a.order_type=#{record.orderType}
</if>
+ and a.delivery_type = 1
</where>
order by a.created_time desc
</select>
@@ -140,7 +148,7 @@
select
a.*
from mall_team_leader a
- where a.state = 1
+ where a.state = 1 and a.online_state = 1
</select>
<select id="selectLeaderByUniqueCode" resultType="cc.mrbird.febs.mall.entity.MallTeamLeader">
@@ -163,7 +171,7 @@
) * 1000
) AS distance
from mall_team_leader a
- where a.state = 1
+ where a.state = 1 and a.online_state = 1
order by distance ASC limit 1
</select>
@@ -172,4 +180,38 @@
where a.team_leader_id = #{record.teamLeaderId}
</select>
+ <select id="selectLeaderByUniqueCodeAndOrderBycreateTime" resultType="cc.mrbird.febs.mall.entity.MallTeamLeader">
+ select
+ a.*
+ from mall_team_leader a
+ where a.unique_code = #{uniqueCode}
+ order by a.CREATED_TIME desc
+ limit 1
+ </select>
+
+ <select id="selectByFenceIdAndFenceNameAndLonAndLat" resultType="cc.mrbird.febs.mall.entity.MallTeamLeader">
+ select
+ a.*,
+ ROUND(
+ 6378.138 * 2 * ASIN(
+ SQRT(
+ POW(SIN((#{latitude} * PI() / 180 - a.latitude * PI() / 180) / 2),2)
+ + COS(40.0497810000 * PI() / 180) * COS(a.latitude * PI() / 180)
+ * POW(SIN((#{longitude} * PI() / 180 - a.longitude * PI() / 180) / 2),2)
+ )
+ ) * 1000
+ ) AS distance
+ from mall_team_leader a
+ inner join mall_electronic_fence b on b.team_leader_code = a.unique_code
+ where b.gid = #{fenceId}
+ and b.fence_name = #{fenceName}
+ </select>
+
+ <select id="getAllMallTeamLeaderList" resultType="cc.mrbird.febs.mall.entity.MallTeamLeader">
+ select
+ a.*
+ from mall_team_leader a
+ where a.state = 1
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1