From 959bd76c3dd17ff7cb0b492c7568b8b54c09dee2 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 29 Jan 2024 23:42:27 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 121 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 121 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..08eda2d 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;
@@ -17,6 +20,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -66,6 +70,18 @@
@ControllerEndpoint(operation = "会员列表---禁止", exceptionMessage = "禁止失败")
public FebsResponse closeAccount(@NotNull(message = "{required}") @PathVariable Long id) {
return mallMemberService.closeAccount(id);
+ }
+
+ /**
+ * 会员列表---注销
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("memberOut/{id}")
+ @ControllerEndpoint(operation = "会员列表---注销", exceptionMessage = "操作失败")
+ public FebsResponse memberOut(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.memberOut(id);
}
/**
@@ -132,6 +148,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 +241,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 +529,89 @@
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("upSale/{id}")
+ @ControllerEndpoint(operation = " 会员列表-推销员设置", exceptionMessage = "操作失败")
+ public FebsResponse upSale(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.upCoupon(id);
+ }
+
+ /**
+ * 会员列表-推销员设置
+ */
+ @GetMapping("downSale/{id}")
+ @ControllerEndpoint(operation = " 会员列表-推销员设置", exceptionMessage = "操作失败")
+ public FebsResponse downSale(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.downCoupon(id);
+ }
+
+ /**
+ * 推销员列表
+ *
+ * @param mallMember
+ * @param request
+ * @return
+ */
+ @GetMapping("getsalemanRuleList")
+ public FebsResponse getsalemanRuleList(MallMember mallMember, QueryRequest request) {
+ mallMember.setIsSale(1);
+ Map<String, Object> data = getDataTable(mallMemberService.getsalemanRuleList(mallMember, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 推销员列表-优惠卷绑定
+ */
+ @PostMapping("salemanCoupon")
+ @ControllerEndpoint(operation = "推销员列表-优惠卷绑定", exceptionMessage = "操作失败")
+ public FebsResponse salemanCoupon(@Valid MallMember mallmember) {
+ return mallMemberService.salemanCoupon(mallmember);
+ }
+
+ @PostMapping("vipLevelSetUpdate")
+ public FebsResponse vipLevelSetUpdate(MallMember member) {
+ member.setVipLevelTime(new Date());
+ mallMemberService.updateById(member);
+ return new FebsResponse().success().message("操作成功");
+ }
+
}
--
Gitblit v1.9.1