From ea8e4abfb8c81cdae4d2a8743d81b615000f352d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 23 May 2025 16:57:23 +0800
Subject: [PATCH] feat(order): 添加自提点订单确认功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 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 12c7d08..394b113 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
@@ -17,6 +17,7 @@
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAdminMallTeamLeaderService;
import cc.mrbird.febs.mall.service.IMallElectronicFenceService;
+import cc.mrbird.febs.mall.vo.AdminLeaderVo;
import cc.mrbird.febs.mall.vo.AdminMallActSetVo;
import cc.mrbird.febs.mall.vo.AdminMallTeamLeaderVo;
import cc.mrbird.febs.mall.vo.AdminSelectListLeaderVo;
@@ -27,6 +28,7 @@
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -42,6 +44,7 @@
import org.apache.http.entity.ContentType;
import org.apache.http.message.BasicNameValuePair;
import org.apache.poi.ss.formula.functions.T;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -135,7 +138,7 @@
for(MallTeamLeader teamLeader : mallTeamLeaders){
AdminSelectListLeaderVo adminSelectListLeaderVo = new AdminSelectListLeaderVo();
adminSelectListLeaderVo.setUniqueCode(teamLeader.getUniqueCode());
- adminSelectListLeaderVo.setName(teamLeader.getName());
+ adminSelectListLeaderVo.setName(teamLeader.getName() + "-" + teamLeader.getAddressArea());
list.add(adminSelectListLeaderVo);
}
}
@@ -189,18 +192,20 @@
List<MallTeamLeader> mallTeamLeaderNo = this.baseMapper.selectListByMemberIdAndState(memberId, MallTeamLeader.STATE_NO);
if(CollUtil.isNotEmpty(mallTeamLeaderNo)){
mallTeamLeaderAdd = mallTeamLeaderNo.get(0);
- }
-// Double bonusPercent = Double.parseDouble(adminLeaderAddDto.getBonusPercent());
-// if(1 <= bonusPercent || 0 > bonusPercent){
-// return new FebsResponse().fail().message("请输入合适的百分比小数");
-// }
- if(ObjectUtil.isNotEmpty(mallTeamLeaderAdd)){
- mallTeamLeaderAdd = MallTeamLeaderConversion.INSTANCE.adminDtoToEntity(adminLeaderAddDto);
- mallTeamLeaderAdd.setState(MallTeamLeader.STATE_YES);
- //申请团长默认关闭返利，返利比例为0
- mallTeamLeaderAdd.setProfitSwitch(2);
- mallTeamLeaderAdd.setBonusPercent("0");
- this.baseMapper.updateById(mallTeamLeaderAdd);
+ if(ObjectUtil.isNotEmpty(mallTeamLeaderAdd)){
+ mallTeamLeaderAdd.setName(adminLeaderAddDto.getName());
+ mallTeamLeaderAdd.setPhone(adminLeaderAddDto.getPhone());
+ mallTeamLeaderAdd.setAddressPic(adminLeaderAddDto.getAddressPic());
+ mallTeamLeaderAdd.setAddressArea(adminLeaderAddDto.getAddressArea());
+ mallTeamLeaderAdd.setDetailAddress(adminLeaderAddDto.getDetailAddress());
+ mallTeamLeaderAdd.setLongitude(adminLeaderAddDto.getLongitude());
+ mallTeamLeaderAdd.setLatitude(adminLeaderAddDto.getLatitude());
+ mallTeamLeaderAdd.setState(MallTeamLeader.STATE_YES);
+ //申请团长默认关闭返利，返利比例为0
+ mallTeamLeaderAdd.setProfitSwitch(2);
+ mallTeamLeaderAdd.setBonusPercent("0");
+ this.baseMapper.updateById(mallTeamLeaderAdd);
+ }
}else{
MallTeamLeader mallTeamLeader = MallTeamLeaderConversion.INSTANCE.adminDtoToEntity(adminLeaderAddDto);
mallTeamLeader.setUniqueCode(mallMember.getInviteId());
@@ -213,6 +218,10 @@
mallTeamLeader.setBonusPercent("0");
this.baseMapper.insert(mallTeamLeader);
}
+// Double bonusPercent = Double.parseDouble(adminLeaderAddDto.getBonusPercent());
+// if(1 <= bonusPercent || 0 > bonusPercent){
+// return new FebsResponse().fail().message("请输入合适的百分比小数");
+// }
return new FebsResponse().success();
}
@@ -383,4 +392,25 @@
return new FebsResponse().success();
}
+ @Override
+ public List<AdminLeaderVo> getLeaderTree() {
+ ArrayList<AdminLeaderVo> adminLeaderVos = new ArrayList<>();
+
+ List<MallMember> mallMembers = mallMemberMapper.selectList(
+ new LambdaQueryWrapper<MallMember>()
+ .select(MallMember::getId, MallMember::getName, MallMember::getInviteId)
+ .ne(MallMember::getStoreMaster, 0)
+ );
+ if(CollUtil.isNotEmpty(mallMembers)){
+ for(MallMember mallMember : mallMembers){
+ AdminLeaderVo adminLeaderVo = new AdminLeaderVo();
+ adminLeaderVo.setId(mallMember.getId());
+ adminLeaderVo.setName(mallMember.getName());
+ adminLeaderVo.setUniqueCode(mallMember.getInviteId());
+ adminLeaderVos.add(adminLeaderVo);
+ }
+ }
+ return adminLeaderVos;
+ }
+
}
--
Gitblit v1.9.1