xiaoyong931011
2023-08-17 e203174b7798c223e2a568ff9493b492cdc4b413
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -401,6 +401,7 @@
                    teamChildListVo.setOrderCnt(mallAchieveRecords.size());
                }
            }
            myTeamVo.setTeam(list);
        }
        return myTeamVo;
    }
@@ -524,8 +525,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 +825,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){
@@ -949,6 +957,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);
    }
@@ -1259,6 +1268,32 @@
        this.baseMapper.updateIsDefault(MallAddressInfo.IS_YOUR_Y, memberId, id);
    }
    @Override
    public void confirmOrder(Long id) {
        Long memberId = LoginUserUtil.getAppUser().getId();
        MallOrderInfo orderInfo = mallOrderInfoMapper.selectById(id);
        if (ObjectUtil.isEmpty(orderInfo)) {
            throw new FebsException("订单不存在");
        }
        if (orderInfo.getStatus() != MallOrderInfo.STATUS_PAY) {
            throw new FebsException("该状态不能确认收货");
        }
        if (orderInfo.getDeliverState() != MallOrderInfo.DELIVER_STATUS_DONE) {
            throw new FebsException("该状态不能确认收货");
        }
        orderInfo.setDeliverState(MallOrderInfo.DELIVER_STATUS_OVER);
        mallOrderInfoMapper.updateById(orderInfo);
    }
    @Override
    public MallAddressInfo findAddress() {
        Long memberId = LoginUserUtil.getAppUser().getId();
        MallAddressInfo mallAddressInfo = dappMemberDao.selectAddressOneByMemberId(memberId);
        return mallAddressInfo;
    }
    public static List<List<String>> partitionList(List<String> originalList, int partitionSize) {
        List<List<String>> partitionedList = new ArrayList<>();
        int size = originalList.size();