xiaoyong931011
2023-08-21 92e66aaa7c3643e2497dfef0d031a9eb8e76e184
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -212,17 +212,21 @@
            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);
            }
        }
        return dappMemberEntityIPage;
    }
@@ -532,6 +536,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 +1197,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);