From e70f0cc17b3377a1e200490df94cda368098ff08 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 Jul 2023 14:24:26 +0800
Subject: [PATCH] 短信认证
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 129 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 126 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 2e446c9..f26cca9 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -8,7 +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.*;
+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();
}
@@ -413,12 +436,21 @@
}
/**
- * 推销员列表-删除
+ * 推销员列表-禁用
*/
@GetMapping("salesmanDel/{id}")
- @ControllerEndpoint(operation = "推销员列表-删除", exceptionMessage = "操作失败")
+ @ControllerEndpoint(operation = "推销员列表-禁用", exceptionMessage = "操作失败")
public FebsResponse salesmanDel(@NotNull(message = "{required}") @PathVariable Long id) {
return mallMemberService.salesmanDel(id);
+ }
+
+ /**
+ * 推销员列表-启用
+ */
+ @GetMapping("salesmanUse/{id}")
+ @ControllerEndpoint(operation = "推销员列表-启用", exceptionMessage = "操作失败")
+ public FebsResponse salesmanUse(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.salesmanUse(id);
}
/**
@@ -430,4 +462,95 @@
return mallMemberService.salesmanUpdate(mallSalesman);
}
+ /**
+ * 推销员列表-选择
+ */
+ @GetMapping("salesmans/tree")
+ @ControllerEndpoint(exceptionMessage = "推销员列表失败")
+ public List<AdminMallSalesmansTreeVo> getSalesmansTree(){
+ return mallMemberService.getSalesmansTree();
+ }
+
+ /**
+ * 会员列表-推销员列表-更新
+ */
+ @PostMapping("memberUpdateSalesman")
+ @ControllerEndpoint(operation = "会员列表-推销员列表-更新", exceptionMessage = "操作失败")
+ public FebsResponse memberUpdateSalesman(@Valid MallMember mallmember) {
+ 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();
+ }
+
+ /**
+ * 合伙人申请列表-更新
+ */
+ @PostMapping("agentVerifyUpdate")
+ @ControllerEndpoint(operation = "合伙人申请列表-更新", exceptionMessage = "操作失败")
+ public FebsResponse agentVerifyUpdate(@Valid AdminAgentVerifyVo adminAgentVerifyVo) {
+ return mallMemberService.agentVerifyUpdate(adminAgentVerifyVo);
+ }
+
}
--
Gitblit v1.9.1