From 6e930b85e4ef92a0a6170cbb8f2da930bbcc72e9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 02 Mar 2023 15:57:51 +0800
Subject: [PATCH] 增加活动公告
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 71 ++++++++++++++++++++++++++++++++++-
1 files changed, 68 insertions(+), 3 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 35c9f12..08fb713 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -8,9 +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.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;
@@ -459,4 +460,68 @@
return mallMemberService.memberUpdateSalesman(mallmember);
}
+ /**
+ * 地址金额统计列表
+ */
+ @GetMapping("addressAmountList")
+ public FebsResponse addressAmountList(MallAddressInfo mallAddressInfo, QueryRequest request) {
+ Map<String, Object> data = getDataTable(mallMemberService.getAddressAmountList(mallAddressInfo, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 地址金额统计列表-省
+ */
+ @GetMapping("address/tree")
+ @ControllerEndpoint(exceptionMessage = "地址金额统计列表")
+ public List<AdminMallAddressInfoVo> getAddressTree(){
+ 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();
+ }
+
}
--
Gitblit v1.9.1