短信认证

xiaoyong931011

2023-07-26 e70f0cc17b3377a1e200490df94cda368098ff08

 src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java

@@ -8,10 +8,10 @@
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.vo.AdminAgentLevelOptionTreeVo;
import cc.mrbird.febs.mall.vo.AdminMallAddressInfoVo;
import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryTreeVo;
import cc.mrbird.febs.mall.vo.AdminMallSalesmansTreeVo;
import cc.mrbird.febs.mall.vo.*;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
@@ -135,6 +135,16 @@
     */
    @GetMapping("getMoneyFlowList")
    public FebsResponse getMoneyFlowList(MoneyFlowListDto moneyFlowListDto, QueryRequest request) {
        String startTime = moneyFlowListDto.getStartTime();
        String endTime = moneyFlowListDto.getEndTime();
        if(StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)){
            DateTime dateStartTime= DateUtil.parseDate(startTime);
            DateTime dateEndTime = DateUtil.parseDate(endTime);
            int compare = DateUtil.compare(dateStartTime, dateEndTime);
            if(compare >= 0){
                return new FebsResponse().fail().message("请输入正确的开始时间和结束时间");
            }
        }
        Map<String, Object> data = getDataTable(mallMemberService.getMoneyFlowListInPage(moneyFlowListDto, request));
        return new FebsResponse().success().data(data);
    }
@@ -218,6 +228,16 @@
    @ControllerEndpoint(exceptionMessage = "获取等级失败")
    public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption() {
        return mallMemberService.getAgentLevelOption();
    }

    /**
     * 代理-等级选择Option
     */
    @GetMapping("agentLevelOption/tree")
    @ControllerEndpoint(exceptionMessage = "获取等级失败")
    public List<AdminAgentLevelOptionTreeVo> agentLevelOption() {
//        return mallMemberService.getAgentLevelOption();
        return mallMemberService.agentLevelOption();
    }


@@ -478,4 +498,59 @@
        return mallMemberService.getAddressTree();
    }

    /**
     * 销售员业绩列表
     */
    @GetMapping("salesmanAchieveList")
    public FebsResponse salesmanAchieveList(MallSalesman mallSalesman, QueryRequest request) {
        Map<String, Object> data = getDataTable(mallMemberService.getSalesmanAchieveList(mallSalesman, request));
        return new FebsResponse().success().data(data);
    }

    /**
     * 销售员业绩列表-省
     */
    @GetMapping("salesmanAchieve/tree")
    @ControllerEndpoint(exceptionMessage = "销售员业绩列表")
    public List<AdminSalesmanAchieveVo> getSalesmanAchieveTree(){
        return mallMemberService.getSalesmanAchieveTree();
    }

    /**
     * 合伙人业绩
     */
    @GetMapping("agentAchieveList")
    public FebsResponse agentAchieveList(MallAgentRecord mallAgentRecord, QueryRequest request) {
        String startTime = mallAgentRecord.getStartTime();
        String endTime = mallAgentRecord.getEndTime();
        if(StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)){
            DateTime dateStartTime= DateUtil.parseDate(startTime);
            DateTime dateEndTime = DateUtil.parseDate(endTime);
            int compare = DateUtil.compare(dateStartTime, dateEndTime);
            if(compare >= 0){
                return new FebsResponse().fail().message("请输入正确的开始时间和结束时间");
            }
        }
        Map<String, Object> data = getDataTable(mallMemberService.getAgentAchieveList(mallAgentRecord, request));
        return new FebsResponse().success().data(data);
    }

    /**
     * 合伙人业绩-省
     */
    @GetMapping("agentAddress/tree")
    @ControllerEndpoint(exceptionMessage = "合伙人业绩-省")
    public List<AdminMallAgentRecordVo> agentAddress(){
        return mallMemberService.agentAddress();
    }

    /**
     * 合伙人申请列表-更新
     */
    @PostMapping("agentVerifyUpdate")
    @ControllerEndpoint(operation = "合伙人申请列表-更新", exceptionMessage = "操作失败")
    public FebsResponse agentVerifyUpdate(@Valid AdminAgentVerifyVo adminAgentVerifyVo) {
        return mallMemberService.agentVerifyUpdate(adminAgentVerifyVo);
    }

}