From c1af5cf94920702b6aa962881365116542e88ab0 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Tue, 30 Jul 2024 09:42:46 +0800 Subject: [PATCH] 后台 --- src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 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 fdabd12..e1f7b00 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 @@ -2,10 +2,7 @@ import cc.mrbird.febs.common.entity.FebsResponse; import cc.mrbird.febs.common.entity.QueryRequest; -import cc.mrbird.febs.common.enumerates.AgentLevelEnum; -import cc.mrbird.febs.common.enumerates.FlowTypeEnum; -import cc.mrbird.febs.common.enumerates.MemberLevelEnum; -import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum; +import cc.mrbird.febs.common.enumerates.*; import cc.mrbird.febs.common.exception.FebsException; import cc.mrbird.febs.common.utils.LoginUserUtil; import cc.mrbird.febs.common.utils.MallUtils; @@ -13,10 +10,12 @@ import cc.mrbird.febs.mall.entity.*; import cc.mrbird.febs.mall.entity.MallNewsInfo; import cc.mrbird.febs.mall.mapper.*; +import cc.mrbird.febs.mall.service.AsyncService; import cc.mrbird.febs.mall.service.IAdminMallMemberService; import cc.mrbird.febs.mall.service.IApiMallMemberWalletService; import cc.mrbird.febs.mall.service.IMallMoneyFlowService; import cc.mrbird.febs.mall.vo.*; +import cc.mrbird.febs.monitor.service.ILogService; import cc.mrbird.febs.pay.model.SinglePayDto; import cc.mrbird.febs.pay.service.UnipayService; import cn.hutool.core.collection.CollUtil; @@ -112,6 +111,8 @@ mallMember.setDirector(value); } else if (type == 2){ mallMember.setStoreMaster(value); + }else if (type == 3){ + mallMember.setPartner(value); } else { throw new FebsException("参数错误"); } @@ -174,6 +175,7 @@ mallMoneyFlow.setStatus(2); mallMoneyFlowMapper.updateById(mallMoneyFlow); } + /** * 调用汇聚代付 */ @@ -219,6 +221,7 @@ //用户增加对应的余额 iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance"); + iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"equityLimit"); return new FebsResponse().success(); } @@ -287,10 +290,10 @@ adminAgentLevelOptionTreeVo.setId(MemberLevelEnum.NORMAL.getType()); adminAgentLevelOptionTreeVo.setName("普通会员"); agentLevelOption.add(adminAgentLevelOptionTreeVo); - AdminAgentLevelOptionTreeVo adminAgentLevelOptionTreeVos = new AdminAgentLevelOptionTreeVo(); - adminAgentLevelOptionTreeVos.setId(MemberLevelEnum.V_DIRECTOR.getType()); - adminAgentLevelOptionTreeVos.setName("董事"); - agentLevelOption.add(adminAgentLevelOptionTreeVos); +// AdminAgentLevelOptionTreeVo adminAgentLevelOptionTreeVos = new AdminAgentLevelOptionTreeVo(); +// adminAgentLevelOptionTreeVos.setId(MemberLevelEnum.V_DIRECTOR.getType()); +// adminAgentLevelOptionTreeVos.setName("董事"); +// agentLevelOption.add(adminAgentLevelOptionTreeVos); return dataDictionaryCustomMapper.getAgentLevelOption(); } @@ -589,6 +592,8 @@ return this.baseMapper.selectInfoByInviteId(inviteId); } + + private final AsyncService asyncService; @Override @Transactional(rollbackFor = Exception.class) public void modifyReferer(MallMember member) { @@ -615,6 +620,15 @@ child.setReferrerIds(member.getInviteId() + "," + refererIds); this.baseMapper.updateById(child); } + + log.info("异步更新用户信息"); + List<MallMember> mallMembers = this.baseMapper.selectList(null); + if(CollUtil.isEmpty(mallMembers)){ + return; + } + for(MallMember mallMemberDown : mallMembers){ + asyncService.updateAllMemberReferrerId(mallMemberDown); + } } @Override @@ -638,7 +652,9 @@ AdminMallMemberPaymentVo adminMallMemberPaymentVo = new AdminMallMemberPaymentVo(); if(ObjectUtil.isNotEmpty(mallMemberBank)){ adminMallMemberPaymentVo.setBankNo(mallMemberBank.getBankNo()); - adminMallMemberPaymentVo.setBankName(mallMemberBank.getName()); + adminMallMemberPaymentVo.setName(mallMemberBank.getName()); + adminMallMemberPaymentVo.setBankName(mallMemberBank.getBankName()); + adminMallMemberPaymentVo.setBankNameS(mallMemberBank.getBankNameS()); } return adminMallMemberPaymentVo; } -- Gitblit v1.9.1