From ccaa5b832d9a741b1c1ca97130205cf25450c86a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 20 Sep 2022 17:43:19 +0800
Subject: [PATCH] 20220902

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

diff --git a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
index fb44d2b..d200f3b 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
+        inner 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}, '%'))
@@ -145,7 +147,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 +170,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>
 
@@ -177,4 +179,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