From a56aa58c55f966c38cb8b5fc969eb1018fad5ce8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Sep 2022 16:38:13 +0800
Subject: [PATCH] 20220902
---
src/main/resources/mapper/modules/MallTeamLeaderMapper.xml | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
index b66b32e..dc64fac 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,6 +33,7 @@
) * 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 and a.online_state = 1
<if test="record.query != null and record.query != ''">
@@ -117,6 +119,7 @@
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.status == 4 and record.status != 0">
@@ -145,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">
@@ -168,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>
@@ -186,4 +189,29 @@
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