From 6f1b3a83e85c4ad2b8fdfd090abef8b48f27574d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 20 Sep 2022 11:14:35 +0800
Subject: [PATCH] 20220902
---
src/main/resources/mapper/modules/MallTeamLeaderMapper.xml | 2 ++
src/main/java/cc/mrbird/febs/mall/entity/MallTeamLeader.java | 3 +++
src/main/java/cc/mrbird/febs/mall/vo/ApiLeaderListVo.java | 5 +++++
3 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallTeamLeader.java b/src/main/java/cc/mrbird/febs/mall/entity/MallTeamLeader.java
index 822aad0..3a7afa1 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallTeamLeader.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallTeamLeader.java
@@ -59,4 +59,7 @@
//在线状态 1：在线 2：离线
private Integer onlineState;
+ @TableField(exist = false)
+ private String longlatiarr;
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiLeaderListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiLeaderListVo.java
index abf9e85..41f8d26 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/ApiLeaderListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiLeaderListVo.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
@Data
@ApiModel(value = "AdminMallTeamLeaderVo", description = "信息返回类")
public class ApiLeaderListVo {
@@ -47,4 +49,7 @@
@ApiModelProperty(value = "纬度")
private Double latitude;
+
+ @ApiModelProperty(value = "经纬度坐标")
+ private String longlatiarr;
}
diff --git a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
index 951cce4..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,6 +33,7 @@
) * 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 and a.online_state = 1
<if test="record.query != null and record.query != ''">
--
Gitblit v1.9.1