From 03b71085ceeedd3b8484a2ce8752d4eb62c6ef31 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Sep 2022 16:24:30 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
index 8308a61..e4a9b02 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
@@ -61,6 +61,8 @@
private final MallMoneyFlowMapper mallMoneyFlowMapper;
private final MallElectronicFenceMapper mallElectronicFenceMapper;
private final IMallElectronicFenceService iMallElectronicFenceService;
+ private final SpringContextHolder springContextHolder;
+ private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
@Override
public IPage<AdminMallTeamLeaderVo> getLeaderListInPage(MallTeamLeader mallTeamLeader, QueryRequest request) {
@@ -107,10 +109,10 @@
// return new FebsResponse().fail().message("只有【待审核】状态才能提交！");
// }
- Double bonusPercent = Double.parseDouble(mallTeamLeader.getBonusPercent());
- if(1 <= bonusPercent || 0 > bonusPercent){
- return new FebsResponse().fail().message("请输入合适的百分比小数");
- }
+// Double bonusPercent = Double.parseDouble(mallTeamLeader.getBonusPercent());
+// if(1 <= bonusPercent || 0 > bonusPercent){
+// return new FebsResponse().fail().message("请输入合适的百分比小数");
+// }
int isOk = mallTeamLeader.getIsOk();
if(MallTeamLeader.STATE_YES == isOk){
mallTeamLeader.setState(MallTeamLeader.STATE_YES);
@@ -128,7 +130,7 @@
@Override
public List<AdminSelectListLeaderVo> selectList(MallTeamLeader mallTeamLeader) {
List<AdminSelectListLeaderVo> list = new ArrayList<>();
- List<MallTeamLeader> mallTeamLeaders = this.baseMapper.getMallTeamLeaderList();
+ List<MallTeamLeader> mallTeamLeaders = this.baseMapper.getAllMallTeamLeaderList();
if(CollUtil.isNotEmpty(mallTeamLeaders)){
for(MallTeamLeader teamLeader : mallTeamLeaders){
AdminSelectListLeaderVo adminSelectListLeaderVo = new AdminSelectListLeaderVo();
@@ -183,10 +185,10 @@
if(CollUtil.isNotEmpty(mallTeamLeaderCancel)){
return new FebsResponse().fail().message("当前用户无法申请");
}
- Double bonusPercent = Double.parseDouble(adminLeaderAddDto.getBonusPercent());
- if(1 <= bonusPercent || 0 > bonusPercent){
- return new FebsResponse().fail().message("请输入合适的百分比小数");
- }
+// Double bonusPercent = Double.parseDouble(adminLeaderAddDto.getBonusPercent());
+// if(1 <= bonusPercent || 0 > bonusPercent){
+// return new FebsResponse().fail().message("请输入合适的百分比小数");
+// }
MallTeamLeader mallTeamLeader = MallTeamLeaderConversion.INSTANCE.adminDtoToEntity(adminLeaderAddDto);
mallTeamLeader.setUniqueCode(mallMember.getInviteId());
mallTeamLeader.setMemberId(memberId);
@@ -252,8 +254,6 @@
// System.out.print(sid);
// }
}
-
- private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
@Override
@Transactional
public FebsResponse addFence(AdminLeaderAddFenceDto adminLeaderAddFenceDto) {
@@ -318,14 +318,20 @@
mallElectronicFenceAdd.setServiceId(serviceId);
mallElectronicFenceMapper.insert(mallElectronicFenceAdd);
}else{
- String fenceUpdate = iMallElectronicFenceService.fenceUpdate(xcxProperties.getGaodeKey(), serviceId,
- mallElectronicFence.getGid(), mallElectronicFence.getFenceName(),
- adminLeaderAddFenceDto.getLonglatiarr());
- if("fail".equals(fenceUpdate)){
- return new FebsResponse().fail().message("高德地图更新多边形围栏失败");
+ //删除电子围栏
+ if(StrUtil.isEmpty(adminLeaderAddFenceDto.getLonglatiarr())){
+ iMallElectronicFenceService.fenceDelete(xcxProperties.getGaodeKey(),serviceId,mallElectronicFence.getGid());
+ mallElectronicFenceMapper.deleteById(mallElectronicFence.getId());
+ }else{
+ String fenceUpdate = iMallElectronicFenceService.fenceUpdate(xcxProperties.getGaodeKey(), serviceId,
+ mallElectronicFence.getGid(), mallElectronicFence.getFenceName(),
+ adminLeaderAddFenceDto.getLonglatiarr());
+ if("fail".equals(fenceUpdate)){
+ return new FebsResponse().fail().message("高德地图更新多边形围栏失败");
+ }
+ mallElectronicFence.setLonglatiarr(adminLeaderAddFenceDto.getLonglatiarr());
+ mallElectronicFenceMapper.updateById(mallElectronicFence);
}
- mallElectronicFence.setLonglatiarr(adminLeaderAddFenceDto.getLonglatiarr());
- mallElectronicFenceMapper.updateById(mallElectronicFence);
}
return new FebsResponse().success();
}
@@ -340,10 +346,10 @@
if(1!=state){
return new FebsResponse().fail().message("目前还不是团长，无法操作");
}
- MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(mallTeamLeader.getUniqueCode());
- if(ObjectUtil.isEmpty(mallElectronicFence)){
- return new FebsResponse().fail().message("请先设置配送范围");
- }
+// MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(mallTeamLeader.getUniqueCode());
+// if(ObjectUtil.isEmpty(mallElectronicFence)){
+// return new FebsResponse().fail().message("请先设置配送范围");
+// }
mallTeamLeader.setOnlineState(1);
this.baseMapper.updateById(mallTeamLeader);
return new FebsResponse().success();
--
Gitblit v1.9.1