From 0b459f932333ab6b67fe5aaac6b8bff871ada5f6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 16 Feb 2023 14:54:53 +0800
Subject: [PATCH] 运费模板指定省份不能重复
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 156 insertions(+), 4 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 7a91557..0d6c11c 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
@@ -68,16 +68,24 @@
private final IMallMoneyFlowService mallMoneyFlowService;
private final MallTeamLeaderMapper mallTeamLeaderMapper;
+ private final MallAgentRecordMapper mallAgentRecordMapper;
+ private final MallSalesmanMapper mallSalesmanMapper;
+
@Override
public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
Page<MallMember> page = new Page<>(request.getPageNum(), request.getPageSize());
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());
}
}
}
@@ -600,6 +608,150 @@
}
}
+ @Override
+ public IPage<MallAgentRecord> getAgentApplyList(MallAgentRecord mallAgentRecord, QueryRequest request) {
+ Page<MallAgentRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MallAgentRecord> mallAgentRecords = mallAgentRecordMapper.selectMallAgentRecordListInPage(page, mallAgentRecord);
+ return mallAgentRecords;
+ }
+
+ @Override
+ @Transactional
+ public FebsResponse agreeAgentApply(Long id) {
+ MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallAgentRecord)){
+ return new FebsResponse().fail().message("申请记录不存在");
+ }
+ mallAgentRecord.setState(MallAgentRecord.APPLY_AGREE);
+ mallAgentRecordMapper.updateById(mallAgentRecord);
+
+ //更新用户表中的LEVEL
+ MallMember mallMember = this.baseMapper.selectById(mallAgentRecord.getMemberId());
+ if(ObjectUtil.isEmpty(mallMember)){
+ return new FebsResponse().fail().message("用户不存在");
+ }
+ mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+ this.baseMapper.updateById(mallMember);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ @Transactional
+ public FebsResponse disagreeAgentApply(Long id) {
+ MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallAgentRecord)){
+ return new FebsResponse().fail().message("申请记录不存在");
+ }
+ mallAgentRecord.setState(MallAgentRecord.APPLY_DISAGREE);
+ mallAgentRecordMapper.updateById(mallAgentRecord);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public IPage<MallSalesman> getMallSalesmanListInPage(MallSalesman mallSalesman, QueryRequest request) {
+ Page<MallSalesman> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return mallSalesmanMapper.selectMallSalesmanListInPage(page, mallSalesman);
+ }
+
+ @Override
+ public FebsResponse addSalesman(MallSalesman mallSalesman) {
+ mallSalesmanMapper.insert(mallSalesman);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse salesmanDel(Long id) {
+ MallSalesman mallSalesman = mallSalesmanMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallSalesman)){
+ return new FebsResponse().fail().message("推销员不存在");
+ }
+ mallSalesman.setState(2);
+ mallSalesmanMapper.updateById(mallSalesman);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse salesmanUpdate(MallSalesman mallSalesman) {
+ MallSalesman mallSalesmanNow = mallSalesmanMapper.selectById(mallSalesman.getId());
+ if(ObjectUtil.isEmpty(mallSalesmanNow)){
+ return new FebsResponse().fail().message("推销员不存在");
+ }
+ mallSalesmanMapper.updateById(mallSalesman);
+ 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.setAdminMemberOrderVos(adminMemberOrderVos);
+ }
+ }
+ return adminSalesmanAchieveVoIPage;
+ }
+
+ @Override
+ public List<AdminSalesmanAchieveVo> getSalesmanAchieveTree() {
+ return mallSalesmanMapper.selectSalesmanAchieveProvince();
+ }
+
private String refererIds(String parentId) {
boolean flag = false;
if (StrUtil.isBlank(parentId)) {
--
Gitblit v1.9.1