From d040c0f42d6799e2a89ea2dcbd5e3b0f97bffc2a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Sep 2022 16:04:57 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java | 61 ++++++++++++++++--------------
1 files changed, 32 insertions(+), 29 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 3341286..225e870 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) {
@@ -96,7 +98,7 @@
public FebsResponse leaderUpdate(MallTeamLeader mallTeamLeader) {
Long id = mallTeamLeader.getId();
MallTeamLeader mallTeamLeaders = this.baseMapper.selectById(id);
- if(1 == mallTeamLeader.getOnlineState()){
+ if(1 == mallTeamLeaders.getOnlineState()){
return new FebsResponse().fail().message("请先让团长离线");
}
if(ObjectUtil.isEmpty(mallTeamLeaders)){
@@ -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,9 +254,8 @@
// System.out.print(sid);
// }
}
-
- private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
@Override
+ @Transactional
public FebsResponse addFence(AdminLeaderAddFenceDto adminLeaderAddFenceDto) {
Long id = adminLeaderAddFenceDto.getId();
MallTeamLeader mallTeamLeader = this.baseMapper.selectById(id);
@@ -271,20 +272,22 @@
if("fail".equals(resultStr)){
return new FebsResponse().fail().message("高德地图查询服务失败");
}
- JSONObject jsonObject = JSONUtil.parseObj(resultStr);
- String results = jsonObject.get("results").toString();
- JSONArray jsonArray = JSONUtil.parseArray(results);
- for(Object jsonArray1 : jsonArray){
- JSONObject jsonObject1 = JSONUtil.parseObj(jsonArray1);
- String name = jsonObject1.get("name").toString();
- String sid = jsonObject1.get("sid").toString();
- if(xcxProperties.getServiceName().equals(name)){
- serviceId= sid;
- break;
- }
- }
- if(StrUtil.isBlank(serviceId)){
+ log.info(resultStr);
+ if("null".equals(resultStr) || StrUtil.isBlank(resultStr)){
serviceId = iMallElectronicFenceService.trackServiceAdd(xcxProperties.getGaodeKey(), xcxProperties.getServiceName());
+ }else{
+ JSONObject jsonObject = JSONUtil.parseObj(resultStr);
+ String results = jsonObject.get("results").toString();
+ JSONArray jsonArray = JSONUtil.parseArray(results);
+ for(Object jsonArray1 : jsonArray){
+ JSONObject jsonObject1 = JSONUtil.parseObj(jsonArray1);
+ String name = jsonObject1.get("name").toString();
+ String sid = jsonObject1.get("sid").toString();
+ if(xcxProperties.getServiceName().equals(name)){
+ serviceId= sid;
+ break;
+ }
+ }
}
}else{
serviceId = mallElectronicFences.get(0).getServiceId();
@@ -337,10 +340,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