xiaoyong931011
2023-08-15 642a3ec9b15d7cd853845590c2a044f4970b9358
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -70,6 +70,8 @@
    private final MallAgentRecordMapper mallAgentRecordMapper;
    private final MallSalesmanMapper mallSalesmanMapper;
    private final MallMemberHouseMapper mallMemberHouseMapper;
    private final MallOrderInfoMapper mallOrderInfoMapper;
    @Override
    public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
@@ -186,10 +188,10 @@
        memberWithdrawalDto.setOpenid(mallMember.getOpenId());
        memberWithdrawalDto.setTotalFee(mallMemberWithdraw.getAmount());
        memberWithdrawalDto.setOutTradeNo(mallMoneyFlow.getOrderNo());
        Boolean aBoolean = iXcxPayService.memberWithdrawal(memberWithdrawalDto);
        if(!aBoolean){
            return new FebsResponse().fail().message("微信提现失败,请查看微信商户状态");
        }
//        Boolean aBoolean = iXcxPayService.memberWithdrawal(memberWithdrawalDto);
//        if(!aBoolean){
//            return new FebsResponse().fail().message("微信提现失败,请查看微信商户状态");
//        }
        mallMemberWithdraw.setStatus(2);
        mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
        mallMoneyFlow.setStatus(2);
@@ -301,16 +303,39 @@
        if(BigDecimal.ZERO.compareTo(amount) >= 0){
            throw new FebsException("请输入正确的金额");
        }
        if(StrUtil.isEmpty(adminAgentVerifyVo.getLevelCode())){
            throw new FebsException("请选择代理级别");
        }
        mallAgentRecord.setAgentLevel(adminAgentVerifyVo.getLevelCode());
//        if(StrUtil.isEmpty(adminAgentVerifyVo.getLevelCode())){
//            throw new FebsException("请选择代理级别");
//        }
//        mallAgentRecord.setAgentLevel(adminAgentVerifyVo.getLevelCode());
        mallAgentRecord.setAmount(adminAgentVerifyVo.getAmount());
        mallAgentRecordMapper.updateById(mallAgentRecord);
        return new FebsResponse().success().message("操作成功");
    }
    @Override
    public IPage<MallMemberHouse> getMallRollHouseList(MallMemberHouse mallMemberHouse, QueryRequest request) {
        Page<MallMemberHouse> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<MallMemberHouse> mallMemberHouseIPage = this.baseMapper.getMallRollHouseListInPage(page, mallMemberHouse);
        return mallMemberHouseIPage;
    }
    @Override
    public FebsResponse rollHouseCheck(AdminRollHouseCheckDto rollHouseCheckDto) {
        MallMemberHouse mallMemberHouse = mallMemberHouseMapper.selectById(rollHouseCheckDto.getId());
        String takeCode = rollHouseCheckDto.getTakeCode();
        Long orderId = mallMemberHouse.getOrderId();
        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
        String takeCode1 = mallOrderInfo.getTakeCode();
        if(!takeCode1.equals(takeCode)){
            throw new FebsException("核销码不正确");
        }
        mallMemberHouse.setState(2);
        mallMemberHouseMapper.updateById(mallMemberHouse);
        return new FebsResponse().success().message("操作成功");
    }
    @Override
    public IPage<AdminAgentMemberVo> agentChild(QueryRequest request, MallMember mallMember) {
        Long memberId = mallMember.getId();
        mallMember = mallMemberMapper.selectById(memberId);