From 246b7e2857d64e9b590d3dc3317e0b0fc459a11f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Aug 2023 14:58:21 +0800
Subject: [PATCH] 后台修改

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 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 8896493..86361c1 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
@@ -72,6 +72,7 @@
     private final MallGoodsCategoryMapper mallGoodsCategoryMapper;
     private final PlatformBannerMapper platformBannerMapper;
     private final MallGoodsImagesMapper goodsImagesMapper;
+    private final MemberCoinWithdrawDao memberCoinWithdrawDao;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -217,7 +218,8 @@
             for(DappMemberEntity memberEntity : records){
                 Long memberId = memberEntity.getId();
 
-                List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberId(memberId);
+//                List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberId(memberId);
+                List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberIdAndScore(memberId);
                 BigDecimal myShareAchieve = BigDecimal.ZERO;
                 if(CollUtil.isNotEmpty(mallAchieveRecords)){
                     Date payTime = mallAchieveRecords.get(0).getPayTime();
@@ -227,8 +229,11 @@
                 memberEntity.setMyShareAchieve(myShareAchieve);
 
 
-                BigDecimal totalIncomeMember = dappMemberDao.selectAllAchieveByInviteId(memberEntity.getInviteId());
+                BigDecimal totalIncomeMember = dappMemberDao.selectAllAchieveByRefId(memberEntity.getInviteId());
                 memberEntity.setMyTeamAchieve(totalIncomeMember);
+
+                BigDecimal withdrawAmount = memberCoinWithdrawDao.selectByMemberIdAndStatus(memberId, MemberCoinWithdrawEntity.STATUS_YES);
+                memberEntity.setWithdrawAmount(withdrawAmount);
             }
         }
         return dappMemberEntityIPage;
@@ -541,7 +546,8 @@
         dappMemberInfoVo.setPayCnt(payCnt);
         dappMemberInfoVo.setCancelCnt(cancelCnt);
 
-        List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberId(member.getId());
+//        List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberId(member.getId());
+        List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberIdAndScore(member.getId());
         BigDecimal myShareAchieve = BigDecimal.ZERO;
         if(CollUtil.isNotEmpty(mallAchieveRecords)){
             Date payTime = mallAchieveRecords.get(0).getPayTime();
@@ -770,7 +776,7 @@
         }
         BigDecimal totalAmount = orderInfo.getAmount();
         if(achieveAva.compareTo(totalAmount) < 0){
-            throw new FebsException("用户最多购买"+achieveAva.setScale(2,BigDecimal.ROUND_DOWN)+"USDT");
+            throw new FebsException("用户最多购买"+achieveAva.setScale(2,BigDecimal.ROUND_DOWN));
         }
 
         DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(member.getId());
@@ -1298,6 +1304,27 @@
         return dappAKlineMapper.selectListByTypeAndLimit(2, 30);
     }
 
+    @Override
+    public FebsResponse changeAbleYes(Long id) {
+        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(id);
+        if(ObjectUtil.isEmpty(dappMemberEntity)) {
+            return new FebsResponse().fail().message("会员信息不存在");
+        }
+        dappMemberEntity.setChangeAble(1);
+        dappMemberDao.updateById(dappMemberEntity);
+        return new FebsResponse().success();
+    }
+    @Override
+    public FebsResponse changeAbleNo(Long id) {
+        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(id);
+        if(ObjectUtil.isEmpty(dappMemberEntity)) {
+            return new FebsResponse().fail().message("会员信息不存在");
+        }
+        dappMemberEntity.setChangeAble(2);
+        dappMemberDao.updateById(dappMemberEntity);
+        return new FebsResponse().success();
+    }
+
     public static List<List<String>> partitionList(List<String> originalList, int partitionSize) {
         List<List<String>> partitionedList = new ArrayList<>();
         int size = originalList.size();

--
Gitblit v1.9.1