xiaoyong931011
2023-09-04 5d16c166304f7386909cfb5909a7ead4fb3e09b9
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)
@@ -212,17 +213,29 @@
            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);
                List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberIdAndScore(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.selectAllAchieveByRefId(memberEntity.getInviteId());
                memberEntity.setMyTeamAchieve(totalIncomeMember);
                BigDecimal withdrawAmount = memberCoinWithdrawDao.selectByMemberIdAndStatus(memberId, MemberCoinWithdrawEntity.STATUS_YES);
                memberEntity.setWithdrawAmount(withdrawAmount);
            }
        }
        return dappMemberEntityIPage;
    }
@@ -532,6 +545,16 @@
        dappMemberInfoVo.setWaitPayCnt(waitPayCnt);
        dappMemberInfoVo.setPayCnt(payCnt);
        dappMemberInfoVo.setCancelCnt(cancelCnt);
//        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();
            //下第一单之后的共享区全部业绩
            myShareAchieve = mallAchieveRecordMapper.selectAchieveTotalByCreateTime(payTime);
        }
        dappMemberInfoVo.setMyShareAchieve(myShareAchieve);
        return new FebsResponse().success().data(dappMemberInfoVo);
    }
@@ -753,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());
@@ -1184,6 +1207,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);
@@ -1269,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) {