From 86f2368f146af23c9e16507f790752e79858a29f Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 22 Feb 2024 22:34:31 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java |   95 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 95 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 08fb713..3bf4415 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -20,6 +20,7 @@
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -69,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);
     }
 
     /**
@@ -135,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);
     }
@@ -218,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();
     }
 
 
@@ -524,4 +557,66 @@
         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("操作成功");
+    }
+
+    @PostMapping("addMemberCoupon")
+    @ControllerEndpoint(operation = "会员添加优惠券呢", exceptionMessage = "操作失败")
+    public FebsResponse addMemberCoupon(@Valid MallMember mallmember) {
+        return mallMemberService.addMemberCoupon(mallmember);
+    }
 }

--
Gitblit v1.9.1