From 3e4cfdd9da5ed748292e7da7ec42a64d0fe4b75c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 26 Sep 2021 19:00:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 107 insertions(+), 3 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 6423436..c3cc822 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,18 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.mall.dto.AgentDto;
+import cc.mrbird.febs.mall.dto.MoneyChargeListDto;
+import cc.mrbird.febs.mall.dto.MoneyFlowListDto;
import cc.mrbird.febs.mall.entity.MallMember;
+import cc.mrbird.febs.mall.entity.MallMoneyFlow;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
+import cc.mrbird.febs.mall.mapper.MallMemberPaymentMapper;
+import cc.mrbird.febs.mall.mapper.MallMoneyFlowMapper;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
-import cc.mrbird.febs.mall.vo.MallMemberVo;
+import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
+import cc.mrbird.febs.mall.vo.*;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,6 +21,9 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
/**
* @author wzy
@@ -25,6 +36,12 @@
private final MallMemberMapper mallMemberMapper;
+ private final MallMoneyFlowMapper mallMoneyFlowMapper;
+
+ private final MallMemberPaymentMapper mallMemberPaymentMapper;
+
+ private final IApiMallMemberWalletService iApiMallMemberWalletService;
+
@Override
public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
Page<MallMember> page = new Page<>(request.getPageNum(), request.getPageSize());
@@ -33,23 +50,25 @@
}
@Override
+ @Transactional
public FebsResponse closeAccount(Long id) {
MallMember mallMember = mallMemberMapper.selectById(id);
if(ObjectUtil.isEmpty(mallMember)) {
return new FebsResponse().fail().message("会员信息不存在");
}
- mallMember.setAccountStatus(MallMember.ACCOUNTSTATUS_N);
+ mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_DISABLED);
mallMemberMapper.updateById(mallMember);
return new FebsResponse().success();
}
@Override
+ @Transactional
public FebsResponse openAccount(Long id) {
MallMember mallMember = mallMemberMapper.selectById(id);
if(ObjectUtil.isEmpty(mallMember)) {
return new FebsResponse().fail().message("会员信息不存在");
}
- mallMember.setAccountStatus(MallMember.ACCOUNTSTATUS_Y);
+ mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
mallMemberMapper.updateById(mallMember);
return new FebsResponse().success();
}
@@ -60,4 +79,89 @@
return mallMemberVo;
}
+ @Override
+ public IPage<AdminMallMoneyFlowVo> moneyFlow(QueryRequest request, MallMember mallMember) {
+ Page<AdminMallMoneyFlowVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AdminMallMoneyFlowVo> adminMallMoneyFlowVos = mallMoneyFlowMapper.selectMoneyFlowInPage(page, mallMember);
+ return adminMallMoneyFlowVos;
+ }
+
+ @Override
+ public IPage<AdminMoneyFlowListVo> getMoneyFlowListInPage(MoneyFlowListDto moneyFlowListDto, QueryRequest request) {
+ Page<AdminMoneyFlowListVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AdminMoneyFlowListVo> adminMoneyFlowListVos = mallMoneyFlowMapper.getMoneyFlowListInPage(page, moneyFlowListDto);
+ return adminMoneyFlowListVos;
+ }
+
+ @Override
+ public IPage<AdminMoneyChargeListVo> getMoneyChargeListInPage(MoneyChargeListDto moneyChargeListDto, QueryRequest request) {
+ Page<AdminMoneyChargeListVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AdminMoneyChargeListVo> adminMoneyChargeListVos = mallMoneyFlowMapper.getMoneyChargeListInPage(page, moneyChargeListDto);
+ return adminMoneyChargeListVos;
+ }
+
+ @Override
+ @Transactional
+ public FebsResponse chargeAgree(Long id) {
+ MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallMoneyFlow)){
+ return new FebsResponse().fail().message("系统繁忙，请刷新后重试");
+ }
+ if(1 != mallMoneyFlow.getStatus()){
+ return new FebsResponse().fail().message("当前状态不是提现中");
+ }
+ mallMoneyFlow.setStatus(2);
+ mallMoneyFlowMapper.updateById(mallMoneyFlow);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ @Transactional
+ public FebsResponse chargeDisagree(Long id) {
+ MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallMoneyFlow)){
+ return new FebsResponse().fail().message("系统繁忙，请刷新后重试");
+ }
+ if(1 != mallMoneyFlow.getStatus()){
+ return new FebsResponse().fail().message("当前状态不是提现中");
+ }
+ mallMoneyFlow.setStatus(3);
+ mallMoneyFlowMapper.updateById(mallMoneyFlow);
+
+ //用户钱包增加对应的余额
+ iApiMallMemberWalletService.addBalance(mallMoneyFlow.getAmount().negate(),mallMoneyFlow.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());
+ if(ObjectUtil.isNotEmpty(adminMallMemberPaymentVoa)){
+ adminMallMemberPaymentVo = adminMallMemberPaymentVoa;
+ }
+ return adminMallMemberPaymentVo;
+ }
+
+ @Override
+ public IPage<AdminAgentVo> getAgentList(AgentDto agentDto, QueryRequest request) {
+ Page<AdminAgentVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AdminAgentVo> adminAgentVos = this.baseMapper.getAgentListInPage(page, agentDto);
+ List<AdminAgentVo> records = adminAgentVos.getRecords();
+ 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());
+
+ //获取总数
+ List<MallMember> allMallMembers =mallMemberMapper.selectAllChildAgentListByInviteId(inviteId);
+ adminAgentVo.setAllMemberNum(CollUtil.isEmpty(allMallMembers) ? 0 : allMallMembers.size());
+ }
+ }
+ return adminAgentVos;
+ }
+
}
--
Gitblit v1.9.1