From b2ed8c0adb0791f7bef4fc68afcde994db44adf2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 09 Jan 2023 15:55:25 +0800
Subject: [PATCH] 20221227 充值归集
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 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 0ff708d..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
@@ -155,11 +155,11 @@
return new FebsResponse().fail().message("当前状态不是提现中");
}
- Long wtihdrawTypeId = mallMemberWithdraw.getWtihdrawTypeId();
- MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(wtihdrawTypeId);
- if(ObjectUtil.isEmpty(mallMemberBank)){
- return new FebsResponse().fail().message("提现地址不存在");
- }
+// Long wtihdrawTypeId = mallMemberWithdraw.getWtihdrawTypeId();
+// MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(wtihdrawTypeId);
+// if(ObjectUtil.isEmpty(mallMemberBank)){
+// return new FebsResponse().fail().message("提现地址不存在");
+// }
//更新提现记录状态为成功
mallMemberWithdrawMapper.updateStatusById(2,mallMemberWithdraw.getId());
//更新提现流水记录为成功
@@ -224,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());
@@ -231,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;
@@ -277,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);
}
}
@@ -638,6 +650,14 @@
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