From f29a79e0c44f38f3c6c7932b90cc0e2a4d632dd0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Sep 2022 17:32:17 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 46 +++++++++++++++++++++++
src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java | 15 +++++++
src/main/java/cc/mrbird/febs/mall/service/IApiMallTeamLeaderService.java | 2 +
src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java | 2
4 files changed, 64 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java b/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
index aa3f099..fd186af 100644
--- a/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
+++ b/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
@@ -26,7 +26,7 @@
registration.excludePathPatterns("/api/member/cashOutSetting");
registration.excludePathPatterns("/api/leader/leaderList");
registration.excludePathPatterns("/api/leader/leaderListInFence");
-// registration.excludePathPatterns("/api/leader/leaderTitle");
+ registration.excludePathPatterns("/api/leader/noLoginLeaderTitle");
registration.excludePathPatterns("/api/xcxPay/wxpayCallback");
registration.excludePathPatterns("/api/xcxPay/rechargeCallBack");
}
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java
index 3354f45..fdee968 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallTeamLeaderController.java
@@ -134,6 +134,21 @@
return iApiMallTeamLeaderService.leaderTitle(apiLeaderTitleDto);
}
+ /**
+ * 商品列表页的团长信息
+ * 有团长特征码直接显示该团长，
+ * 有经纬度，按照经纬度选择距离最近的
+ * 没有选择团长列表的第一个
+ */
+ @ApiOperation(value = "商品列表页的团长信息", notes = "商品列表页的团长信息")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiLeaderInfoVo.class)
+ })
+ @PostMapping("/noLoginLeaderTitle")
+ public FebsResponse noLoginLeaderTitle(@RequestBody ApiLeaderTitleDto apiLeaderTitleDto) {
+ return iApiMallTeamLeaderService.noLoginLeaderTitle(apiLeaderTitleDto);
+ }
+
@ApiOperation(value = "获取团长订单角标数量")
@GetMapping(value = "/findTeamOrderMarkCnt")
public FebsResponse findTeamOrderMarkCnt() {
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IApiMallTeamLeaderService.java b/src/main/java/cc/mrbird/febs/mall/service/IApiMallTeamLeaderService.java
index e9d495d..585a1d5 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IApiMallTeamLeaderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IApiMallTeamLeaderService.java
@@ -37,4 +37,6 @@
List<ApiOrderProfitVo> findLeaderProfitListInPage(ApiOrderProfitDto apiOrderProfitDto);
FebsResponse findSomeLeaderListInPage(ApiLeaderListDto apiLeaderListDto);
+
+ FebsResponse noLoginLeaderTitle(ApiLeaderTitleDto apiLeaderTitleDto);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 0015aeb..7a25f8e 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -562,4 +562,50 @@
return new FebsResponse().success().data(apiLeaderListVos);
}
+ @Override
+ public FebsResponse noLoginLeaderTitle(ApiLeaderTitleDto apiLeaderTitleDto) {
+ String uniqueCode = apiLeaderTitleDto.getUniqueCode();
+ Double longitude = apiLeaderTitleDto.getLongitude() == null ? 0 : apiLeaderTitleDto.getLongitude();
+ Double latitude = apiLeaderTitleDto.getLatitude() == null ? 0 : apiLeaderTitleDto.getLatitude();
+ ApiLeaderInfoVo apiLeaderInfoVo = new ApiLeaderInfoVo();
+ MallTeamLeader mallTeamLeader = new MallTeamLeader();
+ //特征码扫码
+ if(StrUtil.isNotEmpty(uniqueCode)){
+ mallTeamLeader = this.baseMapper.selectLeaderByUniqueCode(uniqueCode);
+
+ //经纬度定位
+ }else if(longitude != 0 && latitude != 0){
+ mallTeamLeader = this.baseMapper.selectLeaderByLonAndLat(longitude,latitude);
+ //直接进入，默认选择列表第一个
+ }else{
+ List<MallTeamLeader> mallTeamLeaderList = this.baseMapper.getMallTeamLeaderList();
+ if(CollUtil.isNotEmpty(mallTeamLeaderList)){
+ mallTeamLeader = mallTeamLeaderList.get(0);
+ }
+ }
+
+ if(ObjectUtil.isNotEmpty(mallTeamLeader)){
+ apiLeaderInfoVo.setId(mallTeamLeader.getId());
+ apiLeaderInfoVo.setName(mallTeamLeader.getName());
+ apiLeaderInfoVo.setPhone(mallTeamLeader.getPhone());
+ apiLeaderInfoVo.setAddressPic(mallTeamLeader.getAddressPic());
+ apiLeaderInfoVo.setUniqueCode(mallTeamLeader.getUniqueCode());
+ apiLeaderInfoVo.setProvince(mallTeamLeader.getProvince());
+ apiLeaderInfoVo.setCity(mallTeamLeader.getCity());
+ apiLeaderInfoVo.setTownship(mallTeamLeader.getTownship());
+ apiLeaderInfoVo.setDetailAddress(mallTeamLeader.getDetailAddress());
+ apiLeaderInfoVo.setAddressArea(mallTeamLeader.getAddressArea());
+ MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(mallTeamLeader.getUniqueCode());
+ if(ObjectUtil.isNotEmpty(mallElectronicFence)){
+ apiLeaderInfoVo.setLonglatiarr(mallElectronicFence.getLonglatiarr());
+ }
+ apiLeaderInfoVo.setLongitude(mallTeamLeader.getLongitude());
+ apiLeaderInfoVo.setLatitude(mallTeamLeader.getLatitude());
+ }
+ if(ObjectUtil.isEmpty(apiLeaderInfoVo)){
+ return new FebsResponse().success();
+ }
+ return new FebsResponse().success().data(apiLeaderInfoVo);
+ }
+
}
--
Gitblit v1.9.1