From 2b30804879b204db142999fa56710d5f593efd66 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Mon, 08 Jan 2024 10:52:57 +0800 Subject: [PATCH] 团队列表 --- src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 78 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java index 10cf072..8e58190 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java @@ -9,6 +9,9 @@ import cc.mrbird.febs.mall.service.IAdminMallMemberService; import cc.mrbird.febs.mall.service.IApiMallMemberService; 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; @@ -132,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); } @@ -215,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(); } @@ -493,4 +516,59 @@ 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); + } + + /** + * 民宿核销列表 + */ + @GetMapping("rollHouseList") + public FebsResponse rollHouseList(MallMemberHouse mallMemberHouse, QueryRequest request) { + Map<String, Object> data = getDataTable(mallMemberService.getMallRollHouseList(mallMemberHouse, request)); + return new FebsResponse().success().data(data); + } + + /** + * 民宿核销列表-核销 + */ + @PostMapping("rollHouseCheck") + @ControllerEndpoint(operation = "民宿核销列表-核销", exceptionMessage = "操作失败") + public FebsResponse rollHouseCheck(@Valid AdminRollHouseCheckDto rollHouseCheckDto) { + return mallMemberService.rollHouseCheck(rollHouseCheckDto); + } + } -- Gitblit v1.9.1