fix

Hentua

2023-08-17 a52b52cc6f71b4d01a6d19670fd5440e952cb5f3

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java

@@ -285,6 +285,31 @@
        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<AdminAgentMemberVo> agentChild(QueryRequest request, MallMember mallMember) {
        Long memberId = mallMember.getId();
@@ -732,6 +757,47 @@
        return mallSalesmanMapper.selectProvince();
    }

    @Override
    public IPage<AdminSalesmanAchieveVo> getSalesmanAchieveList(MallSalesman mallSalesman, QueryRequest request) {
        Page<AdminSalesmanAchieveVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminSalesmanAchieveVo> adminSalesmanAchieveVoIPage = mallSalesmanMapper.selectSalesmanAchieveListInPage(page, mallSalesman);
        List<AdminSalesmanAchieveVo> records = adminSalesmanAchieveVoIPage.getRecords();
        if(CollUtil.isNotEmpty(records)){
            for(AdminSalesmanAchieveVo adminSalesmanAchieveVo : records){
                Long salesmanId = adminSalesmanAchieveVo.getSalesmanId();
                List<AdminMemberOrderVo> adminMemberOrderVos = mallSalesmanMapper.selectAdminMemberOrderVoBySalesmanId(salesmanId);
                adminSalesmanAchieveVo.setOrderCnt(adminMemberOrderVos.size());
                adminSalesmanAchieveVo.setAdminMemberOrderVos(adminMemberOrderVos);
            }
        }
        return adminSalesmanAchieveVoIPage;
    }

    @Override
    public List<AdminSalesmanAchieveVo> getSalesmanAchieveTree() {
        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)) {