From 48dcbb226d4d33c6ff02b7e68c1c591bcd88270e Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 24 Feb 2023 16:30:41 +0800 Subject: [PATCH] 后台订单显示修改 --- src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 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..08fb713 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; @@ -493,4 +496,32 @@ 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(); + } + } -- Gitblit v1.9.1