From 0a6e3fcaa4850d319c4cfeb60b96c255eb476075 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 31 Jan 2024 11:04:40 +0800
Subject: [PATCH] 会员列表增加波卷功能
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 226 insertions(+), 5 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 215b2cd..91c0fa2 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -5,13 +5,13 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.*;
-import cc.mrbird.febs.mall.entity.AppVersion;
-import cc.mrbird.febs.mall.entity.MallMember;
-import cc.mrbird.febs.mall.entity.MallNewsInfo;
-import cc.mrbird.febs.mall.entity.MallShopApply;
+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;
@@ -135,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);
}
@@ -220,6 +230,25 @@
return mallMemberService.getAgentLevelOption();
}
+ /**
+ * 代理-等级选择Option
+ */
+ @GetMapping("getRollperkOption/tree")
+ @ControllerEndpoint(exceptionMessage = "获取等级失败")
+ public List<AdminAgentLevelOptionTreeVo> getRollperkOption() {
+ return mallMemberService.getRollperkOption();
+ }
+
+ /**
+ * 代理-等级选择Option
+ */
+ @GetMapping("agentLevelOption/tree")
+ @ControllerEndpoint(exceptionMessage = "获取等级失败")
+ public List<AdminAgentLevelOptionTreeVo> agentLevelOption() {
+// return mallMemberService.getAgentLevelOption();
+ return mallMemberService.agentLevelOption();
+ }
+
/**
* 代理列表-全部成员
@@ -253,6 +282,15 @@
@ControllerEndpoint(operation = "代理列表-设置代理级别", exceptionMessage = "操作失败")
public FebsResponse agentLevelSetUpdate(@Valid AgentLevelSetUpdateDto agentLevelSetUpdateDto) {
return mallMemberService.agentLevelSetUpdate(agentLevelSetUpdateDto);
+ }
+
+ /**
+ * 拨付卷
+ */
+ @PostMapping("rollperkSetUpdate")
+ @ControllerEndpoint(operation = "拨付卷", exceptionMessage = "操作失败")
+ public FebsResponse rollperkSetUpdate(@Valid AgentLevelSetUpdateDto agentLevelSetUpdateDto) {
+ return mallMemberService.rollperkSetUpdate(agentLevelSetUpdateDto);
}
/**
@@ -368,4 +406,187 @@
return new FebsResponse().success();
}
+ /**
+ * 代理申请列表
+ */
+ @GetMapping("getAgentApplyList")
+ public FebsResponse getAgentApplyList(MallAgentRecord mallAgentRecord, QueryRequest request) {
+ Map<String, Object> data = getDataTable(mallMemberService.getAgentApplyList(mallAgentRecord, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 代理申请列表
+ * 同意
+ */
+ @GetMapping("agreeAgentApply/{id}")
+ @ControllerEndpoint(operation = "审核代理申请", exceptionMessage = "操作失败")
+ public FebsResponse agreeAgentApply(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.agreeAgentApply(id);
+ }
+
+ /**
+ * 代理申请列表
+ * 拒绝
+ */
+ @GetMapping("disagreeAgentApply/{id}")
+ @ControllerEndpoint(operation = "审核代理申请", exceptionMessage = "操作失败")
+ public FebsResponse disagreeAgentApply(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.disagreeAgentApply(id);
+ }
+
+ /**
+ * 推销员列表
+ */
+ @GetMapping("salesmanList")
+ public FebsResponse salesmanList(MallSalesman mallSalesman, QueryRequest request) {
+ Map<String, Object> data = getDataTable(mallMemberService.getMallSalesmanListInPage(mallSalesman, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 推销员列表-新增
+ */
+ @PostMapping("addSalesman")
+ @ControllerEndpoint(operation = " 推销员列表-新增", exceptionMessage = "操作失败")
+ public FebsResponse addSalesman(@Valid MallSalesman mallSalesman) {
+ return mallMemberService.addSalesman(mallSalesman);
+ }
+
+ /**
+ * 推销员列表-禁用
+ */
+ @GetMapping("salesmanDel/{id}")
+ @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);
+ }
+
+ /**
+ * 推销员列表-更新
+ */
+ @PostMapping("salesmanUpdate")
+ @ControllerEndpoint(operation = "推销员列表-更新", exceptionMessage = "操作失败")
+ public FebsResponse salesmanUpdate(@Valid MallSalesman mallSalesman) {
+ 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);
+ }
+
+ /**
+ * 民宿核销列表
+ */
+ @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