From 099e46614a14ebcb802db480b695a621d1d1d1cd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 22 Aug 2023 10:43:18 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index e0674e9..8896493 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -212,17 +212,25 @@
member.setCurrentUser(currentUser.getUserId());
}
IPage<DappMemberEntity> dappMemberEntityIPage = dappMemberDao.selectInPage(member, page);
-// List<DappMemberEntity> records = dappMemberEntityIPage.getRecords();
-// if(CollUtil.isNotEmpty(records)){
-// for(DappMemberEntity memberEntity : records){
-// Long memberId = memberEntity.getId();
-// DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
-// memberEntity.setCoinAmount(ObjectUtil.isEmpty(dappWalletCoinEntity) ? BigDecimal.ZERO : dappWalletCoinEntity.getAvailableAmount());
-//
-// DappWalletMineEntity dappWalletMineEntity = dappWalletMineDao.selectByMemberId(memberId);
-// memberEntity.setScoreAmount(ObjectUtil.isEmpty(dappWalletMineEntity) ? BigDecimal.ZERO : dappWalletMineEntity.getAvailableAmount());
-// }
-// }
+ List<DappMemberEntity> records = dappMemberEntityIPage.getRecords();
+ if(CollUtil.isNotEmpty(records)){
+ for(DappMemberEntity memberEntity : records){
+ Long memberId = memberEntity.getId();
+
+ List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberId(memberId);
+ BigDecimal myShareAchieve = BigDecimal.ZERO;
+ if(CollUtil.isNotEmpty(mallAchieveRecords)){
+ Date payTime = mallAchieveRecords.get(0).getPayTime();
+ //下第一单之后的共享区全部业绩
+ myShareAchieve = mallAchieveRecordMapper.selectAchieveTotalByCreateTime(payTime);
+ }
+ memberEntity.setMyShareAchieve(myShareAchieve);
+
+
+ BigDecimal totalIncomeMember = dappMemberDao.selectAllAchieveByInviteId(memberEntity.getInviteId());
+ memberEntity.setMyTeamAchieve(totalIncomeMember);
+ }
+ }
return dappMemberEntityIPage;
}
@@ -532,6 +540,15 @@
dappMemberInfoVo.setWaitPayCnt(waitPayCnt);
dappMemberInfoVo.setPayCnt(payCnt);
dappMemberInfoVo.setCancelCnt(cancelCnt);
+
+ List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberId(member.getId());
+ BigDecimal myShareAchieve = BigDecimal.ZERO;
+ if(CollUtil.isNotEmpty(mallAchieveRecords)){
+ Date payTime = mallAchieveRecords.get(0).getPayTime();
+ //下第一单之后的共享区全部业绩
+ myShareAchieve = mallAchieveRecordMapper.selectAchieveTotalByCreateTime(payTime);
+ }
+ dappMemberInfoVo.setMyShareAchieve(myShareAchieve);
return new FebsResponse().success().data(dappMemberInfoVo);
}
@@ -1184,6 +1201,15 @@
packageScorePriceDic.setValue(divide.toString());
dataDictionaryCustomMapper.updateById(packageScorePriceDic);
+
+ DappFundFlowEntity backFlow = new DappFundFlowEntity(
+ 1L,
+ totalAdd,
+ FundFlowEnum.SYSTEM_SALE_PACKAGE_BACK.getCode(),
+ DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
+ BigDecimal.ZERO);
+ dappFundFlowDao.insert(backFlow);
+
DappAKlineEntity dappAKlineEntity = new DappAKlineEntity();
dappAKlineEntity.setOpenPrice(divide);
dappAKlineEntity.setType(1);
--
Gitblit v1.9.1