xiaoyong931011
2023-08-18 6c75b0c0fd6862b0d10793821db7017341a6a771
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -18,6 +18,7 @@
import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cc.mrbird.febs.system.entity.User;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -401,6 +402,7 @@
                    teamChildListVo.setOrderCnt(mallAchieveRecords.size());
                }
            }
            myTeamVo.setTeam(list);
        }
        return myTeamVo;
    }
@@ -524,8 +526,12 @@
        DappWalletMineEntity dappWalletMineEntity = dappWalletMineDao.selectByMemberId(member.getId());
        dappMemberInfoVo.setScore(ObjectUtil.isEmpty(dappWalletMineEntity) ? BigDecimal.ZERO : dappWalletMineEntity.getTotalAmount());
        Integer selectCount = dappMemberDao.selectOrderCntByMemberIdAndStatus(member.getId(),1);
        dappMemberInfoVo.setWaitPayCnt(selectCount);
        Integer waitPayCnt = dappMemberDao.selectOrderCntByMemberIdAndStatus(member.getId(),1);
        Integer payCnt = dappMemberDao.selectOrderCntByMemberIdAndStatus(member.getId(),2);
        Integer cancelCnt = dappMemberDao.selectOrderCntByMemberIdAndStatus(member.getId(),3);
        dappMemberInfoVo.setWaitPayCnt(waitPayCnt);
        dappMemberInfoVo.setPayCnt(payCnt);
        dappMemberInfoVo.setCancelCnt(cancelCnt);
        return new FebsResponse().success().data(dappMemberInfoVo);
    }
@@ -820,6 +826,9 @@
    public FebsResponse salePackage(SalePackageDto salePackageDto) {
        Long memberId = LoginUserUtil.getAppUser().getId();
        BigDecimal cnt = salePackageDto.getCnt();
        if(ObjectUtil.isEmpty(salePackageDto.getCnt())){
            throw new FebsException("请输入正确的数量");
        }
        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
        BigDecimal saleDoing = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId, FundFlowEnum.SALE_PACKAGE.getCode(), DappFundFlowEntity.WITHDRAW_STATUS_ING);
        if(BigDecimal.ZERO.compareTo(saleDoing) < 0){
@@ -909,6 +918,10 @@
    @Override
    public void delOrder(Long id) {
        Long memberId = LoginUserUtil.getAppUser().getId();
        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(id);
        if(MallOrderInfo.STATUS_PAY == mallOrderInfo.getStatus()){
            throw new FebsException("当前订单不允许删除");
        }
        mallOrderInfoMapper.deleteById(id);
        QueryWrapper<MallOrderItem> objectQueryWrapper = new QueryWrapper<>();
@@ -949,6 +962,7 @@
    public IPage<MallAddressInfo> findAddressList(MallGoodsQueryDto queryDto) {
        Long memberId = LoginUserUtil.getAppUser().getId();
        Page<MallAddressInfo> page = new Page<>(queryDto.getPageNow(), queryDto.getPageSize());
        queryDto.setMemberId(memberId);
        return dappMemberDao.selectAddressListInPage(queryDto, page);
    }
@@ -1278,6 +1292,39 @@
        mallOrderInfoMapper.updateById(orderInfo);
    }
    @Override
    public MallAddressInfo findAddress() {
        Long memberId = LoginUserUtil.getAppUser().getId();
        MallAddressInfo mallAddressInfo = dappMemberDao.selectAddressOneByMemberId(memberId);
        return mallAddressInfo;
    }
    @Override
    public List<PackageRecordVo> packageRecord(PackageRecordDto packageRecordDto) {
        List<PackageRecordVo> packageRecordVos = new ArrayList<>();
        Integer type = packageRecordDto.getType();
        if(2 == type){
            packageRecordVos = dappMemberDao.selectPackageRecordWeekInPage(DateUtil.beginOfWeek(DateUtil.date()));
        }else if(3 == type){
            packageRecordVos = dappMemberDao.selectPackageRecordMonthInPage(DateUtil.date());
        }else{
            packageRecordVos = dappMemberDao.selectPackageRecordDayInPage(DateUtil.date());
        }
        if(CollUtil.isNotEmpty(packageRecordVos)){
            Integer packageNum = 0;
            for(PackageRecordVo packageRecordVo : packageRecordVos){
                packageNum = packageNum + 1;
                packageRecordVo.setPackageNum(packageNum);
            }
        }
        return packageRecordVos;
    }
    @Override
    public List<AKLineLimitVo> packageKline() {
        return dappAKlineMapper.selectListByTypeAndLimit(2, 30);
    }
    public static List<List<String>> partitionList(List<String> originalList, int partitionSize) {
        List<List<String>> partitionedList = new ArrayList<>();
        int size = originalList.size();