From b50ce4f17ad242f8e27d9fae71ee4c01623a5983 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 29 Mar 2023 10:45:50 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 151 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 127 insertions(+), 24 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 2db036f..09a2aaf 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,9 +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.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;
@@ -16,6 +14,8 @@
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.pay.model.SinglePayDto;
+import cc.mrbird.febs.pay.service.UnipayService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -58,11 +58,14 @@
private final IApiMallMemberWalletService iApiMallMemberWalletService;
private final AppVersionMapper appVersionMapper;
+ private final MallMemberWithdrawMapper mallMemberWithdrawMapper;
private final MallNewsInfoMapper mallNewsInfoMapper;
private final MallShopApplyMapper mallShopApplyMapper;
private final IMallMoneyFlowService mallMoneyFlowService;
+ private final UnipayService unipayService;
+ private final MallMemberBankMapper mallMemberBankMapper;
@Override
public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
@@ -143,41 +146,70 @@
@Override
@Transactional
public FebsResponse chargeAgree(Long id) {
- MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectById(id);
- if(ObjectUtil.isEmpty(mallMoneyFlow)){
+
+ MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallMemberWithdraw)){
return new FebsResponse().fail().message("系统繁忙，请刷新后重试");
}
- if(1 != mallMoneyFlow.getStatus()){
+ if(1 != mallMemberWithdraw.getStatus()){
return new FebsResponse().fail().message("当前状态不是提现中");
}
- mallMoneyFlow.setStatus(2);
- mallMoneyFlowMapper.updateById(mallMoneyFlow);
+
+// Long wtihdrawTypeId = mallMemberWithdraw.getWtihdrawTypeId();
+// MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(wtihdrawTypeId);
+// if(ObjectUtil.isEmpty(mallMemberBank)){
+// return new FebsResponse().fail().message("提现地址不存在");
+// }
+ //更新提现记录状态为成功
+ mallMemberWithdrawMapper.updateStatusById(2,mallMemberWithdraw.getId());
+ //更新提现流水记录为成功
+ String withdrawNo = mallMemberWithdraw.getWithdrawNo();
+ MallMoneyFlow withdrawMoneyFlow = mallMoneyFlowMapper.selectOneByMemberIdAndOrderNoAndTypeAndStatusAndIsReturn(
+ mallMemberWithdraw.getMemberId(),
+ withdrawNo,
+ MallMoneyFlowTypeEnum.WITHDRAW.getCode(),
+ MallMoneyFlow.STATUS_ING,
+ MallMoneyFlow.IS_RETURN_Y
+ );
+ withdrawMoneyFlow.setStatus(MallMoneyFlow.STATUS_SUCCESS);
+ mallMoneyFlowMapper.updateById(withdrawMoneyFlow);
return new FebsResponse().success();
}
@Override
@Transactional
public FebsResponse chargeDisagree(Long id) {
- MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectById(id);
- if(ObjectUtil.isEmpty(mallMoneyFlow)){
+ MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallMemberWithdraw)){
return new FebsResponse().fail().message("系统繁忙，请刷新后重试");
}
- if(1 != mallMoneyFlow.getStatus()){
+ if(1 != mallMemberWithdraw.getStatus()){
return new FebsResponse().fail().message("当前状态不是提现中");
}
- mallMoneyFlow.setStatus(3);
- mallMoneyFlowMapper.updateById(mallMoneyFlow);
+ //更新提现记录状态为失败
+ mallMemberWithdrawMapper.updateStatusById(3,mallMemberWithdraw.getId());
+ //更新提现流水记录为成功
+ String withdrawNo = mallMemberWithdraw.getWithdrawNo();
+ MallMoneyFlow withdrawMoneyFlow = mallMoneyFlowMapper.selectOneByMemberIdAndOrderNoAndTypeAndStatusAndIsReturn(
+ mallMemberWithdraw.getMemberId(),
+ withdrawNo,
+ MallMoneyFlowTypeEnum.WITHDRAW.getCode(),
+ MallMoneyFlow.STATUS_ING,
+ MallMoneyFlow.IS_RETURN_Y
+ );
+ withdrawMoneyFlow.setStatus(MallMoneyFlow.STATUS_FAIL);
+ mallMoneyFlowMapper.updateById(withdrawMoneyFlow);
- //用户钱包增加对应的余额
- iApiMallMemberWalletService.addBalance(mallMoneyFlow.getAmount().negate(),mallMoneyFlow.getMemberId());
+ //用户余额增加对应的余额
+ iApiMallMemberWalletService.addBalance(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId());
return new FebsResponse().success();
}
@Override
public AdminMallMemberPaymentVo getMallMemberPaymentInfoByFlowId(long id) {
AdminMallMemberPaymentVo adminMallMemberPaymentVo = new AdminMallMemberPaymentVo();
- MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectById(id);
- AdminMallMemberPaymentVo adminMallMemberPaymentVoa = mallMemberPaymentMapper.getMallMemberPaymentInfoByMemberId(mallMoneyFlow.getMemberId());
+ MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectById(id);
+ AdminMallMemberPaymentVo adminMallMemberPaymentVoa = mallMemberPaymentMapper.getMallMemberPaymentInfoByMemberId(mallMemberWithdraw.getMemberId());
if(ObjectUtil.isNotEmpty(adminMallMemberPaymentVoa)){
adminMallMemberPaymentVo = adminMallMemberPaymentVoa;
}
@@ -192,6 +224,7 @@
if(CollUtil.isNotEmpty(records)){
for(AdminAgentVo adminAgentVo : records){
String inviteId = adminAgentVo.getInviteId();
+
//直接下级
List<MallMember> mallMembers = mallMemberMapper.selectChildAgentListByInviteId(inviteId);
adminAgentVo.setMemberNum(CollUtil.isEmpty(mallMembers) ? 0 : mallMembers.size());
@@ -199,6 +232,17 @@
//获取总数
List<MallMember> allMallMembers =mallMemberMapper.selectAllChildAgentListByInviteId(inviteId);
adminAgentVo.setAllMemberNum(CollUtil.isEmpty(allMallMembers) ? 0 : allMallMembers.size());
+
+ //团队业绩
+ BigDecimal amount = BigDecimal.ZERO;
+ if(CollUtil.isNotEmpty(allMallMembers)){
+ for(MallMember teamMember : allMallMembers){
+ Long memberId = teamMember.getId();
+ BigDecimal sumAmount = mallMemberMapper.getSumAmountByMemberId(memberId);
+ amount = amount.add(sumAmount);
+ }
+ }
+ adminAgentVo.setAmount(amount);
}
}
return adminAgentVos;
@@ -245,8 +289,8 @@
List<AdminAgentMemberVo> records = adminAgentMemberVos.getRecords();
if(CollUtil.isNotEmpty(records)){
for(AdminAgentMemberVo agentMemberVo : records){
- String inviteId = agentMemberVo.getInviteId();
- BigDecimal amount = mallMemberMapper.getAgentTeamAmountByInviteId(inviteId);
+ Long agentMemberVoId = agentMemberVo.getId();
+ BigDecimal amount = mallMemberMapper.getSumAmountByMemberId(agentMemberVoId);
agentMemberVo.setAmount(amount);
}
}
@@ -358,17 +402,40 @@
}
if (isReduce) {
- iApiMallMemberWalletService.reduce(mallSystemPayDto.getAddBalance().negate(), mallSystemPayDto.getId(), filedType);
+ int i = iApiMallMemberWalletService.reduce(mallSystemPayDto.getAddBalance().negate(), mallSystemPayDto.getId(), filedType);
+
+ if (i == 2) {
+ throw new FebsException("剩余数量不足");
+ }
} else {
iApiMallMemberWalletService.add(mallSystemPayDto.getAddBalance(), mallSystemPayDto.getId(), filedType);
}
- mallMoneyFlowService.addMoneyFlow(memberId, bigDecimal, MoneyFlowTypeEnum.SYSTEM.getValue(), null, type);
+
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ null,
+ bigDecimal,
+ MallMoneyFlowTypeEnum.SYSTEM_CHARGE.getCode(),
+ MallMoneyFlow.STATUS_SUCCESS,
+ MallMoneyFlow.IS_RETURN_Y,
+ memberId,
+ FlowTypeEnum.BALANCE.getValue(),
+ MallMoneyFlowTypeEnum.SYSTEM_CHARGE.getName()
+ );
return new FebsResponse().success();
}
@Override
public AdminAgentLevelSetInfoVo getAgentLevelSetInfoByMemberId(long id) {
- AdminAgentLevelSetInfoVo adminAgentLevelSetInfoVo = mallMemberMapper.getAgentLevelSetInfoByMemberId(id);
+ AdminAgentLevelSetInfoVo adminAgentLevelSetInfoVo = new AdminAgentLevelSetInfoVo();
+ AdminAgentLevelSetInfoVo adminAgentLevelSetInfo = mallMemberMapper.getAgentLevelSetInfoByMemberId(id);
+ if(ObjectUtil.isEmpty(adminAgentLevelSetInfo)){
+ adminAgentLevelSetInfoVo.setId(id);
+ adminAgentLevelSetInfoVo.setLevelCode(MemberAgentLevelEnum.AGENT.getCodeByName(MemberAgentLevelEnum.AGENT.getName()));
+ }else{
+ adminAgentLevelSetInfoVo.setId(id);
+ adminAgentLevelSetInfoVo.setLevelCode(MemberAgentLevelEnum.AGENT.getCodeByName(adminAgentLevelSetInfo.getLevelCode()));
+ }
return adminAgentLevelSetInfoVo;
}
@@ -379,8 +446,10 @@
if(ObjectUtil.isEmpty(mallMember)){
return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
}
- mallMember.setLevel(agentLevelSetUpdateDto.getLevelCode());
- mallMemberMapper.updateById(mallMember);
+ String levelCode = agentLevelSetUpdateDto.getLevelCode();
+ String nameByCode = MemberAgentLevelEnum.AGENT.getNameByCode(levelCode);
+ mallMemberMapper.updateLevelStatusById(1,memberId);
+ mallMemberMapper.updateLevelById(nameByCode,memberId);
return new FebsResponse().success();
}
@@ -555,6 +624,40 @@
}
}
+ @Override
+ public void updateShopApply(MallShopApply apply) {
+ MallShopApply mallShopApply = mallShopApplyMapper.selectById(apply.getId());
+ mallShopApply.setName(apply.getName());
+ mallShopApply.setPhone(apply.getPhone());
+ mallShopApply.setIdcard(apply.getIdcard());
+ mallShopApply.setBusinessLicense(apply.getBusinessLicense());
+ mallShopApply.setSaleArea(apply.getSaleArea());
+ mallShopApply.setShopName(apply.getShopName());
+ mallShopApplyMapper.updateById(mallShopApply);
+ }
+
+ @Override
+ public AdminMallMemberPaymentVo getMallBankInfoById(long id) {
+
+ MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectById(id);
+ Long wtihdrawTypeId = mallMemberWithdraw.getWtihdrawTypeId();
+ MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(wtihdrawTypeId);
+ AdminMallMemberPaymentVo adminMallMemberPaymentVo = new AdminMallMemberPaymentVo();
+ if(ObjectUtil.isNotEmpty(mallMemberBank)){
+ adminMallMemberPaymentVo.setBankNo(mallMemberBank.getBankNo());
+ adminMallMemberPaymentVo.setBankName(mallMemberBank.getName());
+ }
+ return adminMallMemberPaymentVo;
+ }
+
+ @Override
+ public IPage<MemberCoinChargeEntity> getChargeList(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
+
+ Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MemberCoinChargeEntity> memberCoinChargeEntityIPage = this.baseMapper.selectMemberChargeListInPage(page, memberCoinChargeEntity);
+ return memberCoinChargeEntityIPage;
+ }
+
private String refererIds(String parentId) {
boolean flag = false;
if (StrUtil.isBlank(parentId)) {
--
Gitblit v1.9.1