From 5d16c166304f7386909cfb5909a7ead4fb3e09b9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 04 Sep 2023 11:05:23 +0800
Subject: [PATCH] 后台修改

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 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 6cb3dc4..9ec12f9 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
@@ -218,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();
@@ -228,7 +229,7 @@
                 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);
@@ -545,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();
@@ -1299,7 +1301,33 @@
 
     @Override
     public List<AKLineLimitVo> packageKline() {
-        return dappAKlineMapper.selectListByTypeAndLimit(2, 30);
+//        return dappAKlineMapper.selectListByTypeAndLimit(2, 30);
+        List<AKLineLimitVo> akLineLimitVos = dappAKlineMapper.selectListByTypeAndLimitDesc(1, 60);
+        List<AKLineLimitVo> sortedList = akLineLimitVos.stream()
+                .sorted((k1, k2) -> k1.getCreateTime().compareTo(k2.getCreateTime()))
+                .collect(Collectors.toList());
+        return sortedList;
+    }
+
+    @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) {

--
Gitblit v1.9.1