From 12112eaff727c3a4554b19840e735e2b60cbd1f2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 05 Jan 2024 11:19:07 +0800
Subject: [PATCH] 团队列表
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 156 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index d98a241..a7b23d0 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -70,6 +70,8 @@
private final MallAgentRecordMapper mallAgentRecordMapper;
private final MallSalesmanMapper mallSalesmanMapper;
+ private final MallMemberHouseMapper mallMemberHouseMapper;
+ private final MallOrderInfoMapper mallOrderInfoMapper;
@Override
public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
@@ -77,10 +79,15 @@
IPage<MallMember> mallMembers = this.baseMapper.selectMallMemberListInPage(page, mallMember);
if(CollUtil.isNotEmpty(mallMembers.getRecords())){
for(MallMember mallMemberTeam : mallMembers.getRecords()){
- String inviteId = mallMemberTeam.getInviteId();
- MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCodeAndOrderBycreateTime(inviteId);
- if(ObjectUtil.isNotEmpty(mallTeamLeader)){
- mallMemberTeam.setLeaderState(mallTeamLeader.getState() == null ? 0 : mallTeamLeader.getState());
+ Long salesmansId = mallMemberTeam.getSalesmansId();
+ MallSalesman mallSalesman = mallSalesmanMapper.selectById(salesmansId);
+ if(ObjectUtil.isNotEmpty(mallSalesman)){
+ StringBuffer salesmanName = new StringBuffer();
+ salesmanName.append(mallSalesman.getName());
+ if(2 == mallSalesman.getState()){
+ salesmanName.append("（禁用）");
+ }
+ mallMemberTeam.setSalesmansName(salesmanName.toString());
}
}
}
@@ -181,10 +188,10 @@
memberWithdrawalDto.setOpenid(mallMember.getOpenId());
memberWithdrawalDto.setTotalFee(mallMemberWithdraw.getAmount());
memberWithdrawalDto.setOutTradeNo(mallMoneyFlow.getOrderNo());
- Boolean aBoolean = iXcxPayService.memberWithdrawal(memberWithdrawalDto);
- if(!aBoolean){
- return new FebsResponse().fail().message("微信提现失败，请查看微信商户状态");
- }
+// Boolean aBoolean = iXcxPayService.memberWithdrawal(memberWithdrawalDto);
+// if(!aBoolean){
+// return new FebsResponse().fail().message("微信提现失败，请查看微信商户状态");
+// }
mallMemberWithdraw.setStatus(2);
mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
mallMoneyFlow.setStatus(2);
@@ -278,6 +285,54 @@
@Override
public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption() {
return dataDictionaryCustomMapper.getAgentLevelOption();
+ }
+
+
+ @Override
+ public List<AdminAgentLevelOptionTreeVo> agentLevelOption() {
+ return dataDictionaryCustomMapper.agentLevelOption();
+ }
+
+ @Override
+ public FebsResponse agentVerifyUpdate(AdminAgentVerifyVo adminAgentVerifyVo) {
+ MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(adminAgentVerifyVo.getId());
+ if(ObjectUtil.isEmpty(mallAgentRecord)){
+ throw new FebsException("记录不存在");
+ }
+ BigDecimal amount = adminAgentVerifyVo.getAmount();
+ if(BigDecimal.ZERO.compareTo(amount) >= 0){
+ throw new FebsException("请输入正确的金额");
+ }
+// if(StrUtil.isEmpty(adminAgentVerifyVo.getLevelCode())){
+// throw new FebsException("请选择代理级别");
+// }
+// mallAgentRecord.setAgentLevel(adminAgentVerifyVo.getLevelCode());
+ mallAgentRecord.setAmount(adminAgentVerifyVo.getAmount());
+ mallAgentRecordMapper.updateById(mallAgentRecord);
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
+ public IPage<MallMemberHouse> getMallRollHouseList(MallMemberHouse mallMemberHouse, QueryRequest request) {
+ Page<MallMemberHouse> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MallMemberHouse> mallMemberHouseIPage = this.baseMapper.getMallRollHouseListInPage(page, mallMemberHouse);
+ return mallMemberHouseIPage;
+ }
+
+ @Override
+ public FebsResponse rollHouseCheck(AdminRollHouseCheckDto rollHouseCheckDto) {
+ MallMemberHouse mallMemberHouse = mallMemberHouseMapper.selectById(rollHouseCheckDto.getId());
+ String takeCode = rollHouseCheckDto.getTakeCode();
+
+ Long orderId = mallMemberHouse.getOrderId();
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
+ String takeCode1 = mallOrderInfo.getTakeCode();
+ if(!takeCode1.equals(takeCode)){
+ throw new FebsException("核销码不正确");
+ }
+ mallMemberHouse.setState(2);
+ mallMemberHouseMapper.updateById(mallMemberHouse);
+ return new FebsResponse().success().message("操作成功");
}
@Override
@@ -675,6 +730,99 @@
return new FebsResponse().success();
}
+ @Override
+ public FebsResponse salesmanUse(Long id) {
+ MallSalesman mallSalesman = mallSalesmanMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallSalesman)){
+ return new FebsResponse().fail().message("推销员不存在");
+ }
+ mallSalesman.setState(1);
+ mallSalesmanMapper.updateById(mallSalesman);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public List<AdminMallSalesmansTreeVo> getSalesmansTree() {
+ List<AdminMallSalesmansTreeVo> adminMallSalesmansTreeVos = mallSalesmanMapper.selectTreeByState(1);
+ return adminMallSalesmansTreeVos;
+ }
+
+ @Override
+ public FebsResponse memberUpdateSalesman(MallMember mallmember) {
+ MallMember mallMemberNow = mallMemberMapper.selectById(mallmember.getId());
+ if(ObjectUtil.isEmpty(mallMemberNow)){
+ return new FebsResponse().fail().message("用户不存在");
+ }
+ mallMemberNow.setSalesmansId(mallmember.getSalesmansId());
+ mallMemberMapper.updateById(mallMemberNow);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public IPage<AdminMallAddressInfoVo> getAddressAmountList(MallAddressInfo mallAddressInfo, QueryRequest request) {
+
+ Page<AdminMallAddressInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AdminMallAddressInfoVo> adminMallAddressInfoVoIPage = mallSalesmanMapper.selectAddressAmountListInPage(page, mallAddressInfo);
+ List<AdminMallAddressInfoVo> records = adminMallAddressInfoVoIPage.getRecords();
+ if(CollUtil.isNotEmpty(records)){
+ for(AdminMallAddressInfoVo adminMallAddressInfoVo : records){
+ String province = adminMallAddressInfoVo.getProvince();
+ String city = adminMallAddressInfoVo.getCity();
+ BigDecimal sumAmount = mallSalesmanMapper.selectSumOrderAmountByProvinceAndCity(province,city);
+ adminMallAddressInfoVo.setAmount(sumAmount);
+ Integer orderCnt = mallSalesmanMapper.selectSumOrderCntByProvinceAndCity(province,city);
+ adminMallAddressInfoVo.setOrderCnt(orderCnt);
+ }
+ }
+ return adminMallAddressInfoVoIPage;
+ }
+
+ @Override
+ public List<AdminMallAddressInfoVo> getAddressTree() {
+ return mallSalesmanMapper.selectProvince();
+ }
+
+ @Override
+ public IPage<AdminSalesmanAchieveVo> getSalesmanAchieveList(MallSalesman mallSalesman, QueryRequest request) {
+ Page<AdminSalesmanAchieveVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AdminSalesmanAchieveVo> adminSalesmanAchieveVoIPage = mallSalesmanMapper.selectSalesmanAchieveListInPage(page, mallSalesman);
+ List<AdminSalesmanAchieveVo> records = adminSalesmanAchieveVoIPage.getRecords();
+ if(CollUtil.isNotEmpty(records)){
+ for(AdminSalesmanAchieveVo adminSalesmanAchieveVo : records){
+ Long salesmanId = adminSalesmanAchieveVo.getSalesmanId();
+ List<AdminMemberOrderVo> adminMemberOrderVos = mallSalesmanMapper.selectAdminMemberOrderVoBySalesmanId(salesmanId);
+ adminSalesmanAchieveVo.setOrderCnt(adminMemberOrderVos.size());
+ adminSalesmanAchieveVo.setAdminMemberOrderVos(adminMemberOrderVos);
+ }
+ }
+ return adminSalesmanAchieveVoIPage;
+ }
+
+ @Override
+ public List<AdminSalesmanAchieveVo> getSalesmanAchieveTree() {
+ return mallSalesmanMapper.selectSalesmanAchieveProvince();
+ }
+
+ @Override
+ public IPage<AdminMallAgentRecordVo> getAgentAchieveList(MallAgentRecord mallAgentRecord, QueryRequest request) {
+ Page<AdminMallAgentRecordVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AdminMallAgentRecordVo> adminMallAgentRecordVos = mallSalesmanMapper.selectAgentAchieveListInPage(page, mallAgentRecord);
+ return adminMallAgentRecordVos;
+ }
+
+ @Override
+ public List<AdminMallAgentRecordVo> agentAddress() {
+ List<AdminMallAgentRecordVo> adminMallAgentRecordVos = mallSalesmanMapper.selectAgentAddressProvince();
+ if(CollUtil.isNotEmpty(adminMallAgentRecordVos)){
+ for(AdminMallAgentRecordVo adminMallAgentRecordVo : adminMallAgentRecordVos){
+ String province = adminMallAgentRecordVo.getProvince();
+ List<String> cityList = mallSalesmanMapper.selectAgentAddressCity(province);
+ adminMallAgentRecordVo.setCityList(cityList);
+ }
+ }
+ return adminMallAgentRecordVos;
+ }
+
private String refererIds(String parentId) {
boolean flag = false;
if (StrUtil.isBlank(parentId)) {
--
Gitblit v1.9.1