赠送积分更新状态

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);
@@ -283,6 +285,54 @@
    @Override
    public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption() {
        return dataDictionaryCustomMapper.getAgentLevelOption();
    }


    @Override
    public List<AdminAgentLevelOptionTreeVo> agentLevelOption() {
        return dataDictionaryCustomMapper.agentLevelOption();
    }

    @Override
    public FebsResponse agentVerifyUpdate(AdminAgentVerifyVo adminAgentVerifyVo) {
        MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(adminAgentVerifyVo.getId());
        if(ObjectUtil.isEmpty(mallAgentRecord)){
            throw new FebsException("记录不存在");
        }
        BigDecimal amount = adminAgentVerifyVo.getAmount();
        if(BigDecimal.ZERO.compareTo(amount) >= 0){
            throw new FebsException("请输入正确的金额");
        }
//        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
@@ -741,6 +791,7 @@
            for(AdminSalesmanAchieveVo adminSalesmanAchieveVo : records){
                Long salesmanId = adminSalesmanAchieveVo.getSalesmanId();
                List<AdminMemberOrderVo> adminMemberOrderVos = mallSalesmanMapper.selectAdminMemberOrderVoBySalesmanId(salesmanId);
                adminSalesmanAchieveVo.setOrderCnt(adminMemberOrderVos.size());
                adminSalesmanAchieveVo.setAdminMemberOrderVos(adminMemberOrderVos);
            }
        }
@@ -752,6 +803,26 @@
        return mallSalesmanMapper.selectSalesmanAchieveProvince();
    }

    @Override
    public IPage<AdminMallAgentRecordVo> getAgentAchieveList(MallAgentRecord mallAgentRecord, QueryRequest request) {
        Page<AdminMallAgentRecordVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminMallAgentRecordVo> adminMallAgentRecordVos = mallSalesmanMapper.selectAgentAchieveListInPage(page, mallAgentRecord);
        return adminMallAgentRecordVos;
    }

    @Override
    public List<AdminMallAgentRecordVo> agentAddress() {
        List<AdminMallAgentRecordVo> adminMallAgentRecordVos = mallSalesmanMapper.selectAgentAddressProvince();
        if(CollUtil.isNotEmpty(adminMallAgentRecordVos)){
            for(AdminMallAgentRecordVo adminMallAgentRecordVo : adminMallAgentRecordVos){
                String province = adminMallAgentRecordVo.getProvince();
                List<String> cityList = mallSalesmanMapper.selectAgentAddressCity(province);
                adminMallAgentRecordVo.setCityList(cityList);
            }
        }
        return adminMallAgentRecordVos;
    }

    private String refererIds(String parentId) {
        boolean flag = false;
        if (StrUtil.isBlank(parentId)) {