From 9d54bce9402c6df93be15e081cadc71f525125d0 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Fri, 21 Apr 2023 16:37:09 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java |   86 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 86 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 a2cc7c2..5d46eb0 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -12,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.annotations.Param;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -80,6 +81,30 @@
         return mallMemberService.openAccount(id);
     }
 
+    /**
+     * 会员列表---禁止
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("insideWithYes/{id}")
+    @ControllerEndpoint(operation = "会员列表---禁止", exceptionMessage = "禁止失败")
+    public FebsResponse insideWithYes(@NotNull(message = "{required}") @PathVariable Long id) {
+        return mallMemberService.insideWithType(id,1);
+    }
+
+    /**
+     * 会员列表---开启
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("insideWithNo/{id}")
+    @ControllerEndpoint(operation = "会员列表---开启", exceptionMessage = "开启失败")
+    public FebsResponse insideWithNo(@NotNull(message = "{required}") @PathVariable Long id) {
+        return mallMemberService.insideWithType(id,2);
+    }
+
     @GetMapping("changeIdentityYes/{type}/{id}")
     public FebsResponse changeIdentityYes(@PathVariable("type") Integer type, @PathVariable("id") Long id) {
         mallMemberService.changeIdentity(type, id, 1);
@@ -96,6 +121,7 @@
      * 会员列表-资金流水
      */
     @GetMapping("/moneyFlow")
+    @RequiresPermissions("moneyFlow:update")
     public FebsResponse moneyFlow(QueryRequest request, MallMember mallMember, Integer parentId) {
         if (parentId == null) {
             ViewMallMemberController.idFromMoneyFlow = 0;
@@ -112,6 +138,16 @@
     @ControllerEndpoint(operation = "会员列表-系统拨付", exceptionMessage = "操作失败")
     public FebsResponse updateSystemPay(@Valid MallSystemPayDto mallSystemPayDto) {
         return mallMemberService.updateSystemPay(mallSystemPayDto);
+    }
+
+    /**
+     * 会员列表-系统拨付绿色凭证
+     */
+    @PostMapping("updateVoucher")
+    @ControllerEndpoint(operation = "会员列表-系统拨付绿色凭证", exceptionMessage = "操作失败")
+    public FebsResponse updateVoucher(@Valid MallSystemPayDto mallSystemPayDto) {
+//        return mallMemberService.updateSystemPay(mallSystemPayDto);
+        return mallMemberService.updateVoucher(mallSystemPayDto);
     }
 
     /**
@@ -372,4 +408,54 @@
         return new FebsResponse().success();
     }
 
+    /**
+     * 创世释放记录-列表
+     * @param roleReleaseDto
+     * @param request
+     * @return
+     */
+    @GetMapping("gerRoleRelease")
+    public FebsResponse gerRoleRelease(AdminRoleReleaseDto roleReleaseDto, QueryRequest request) {
+        Map<String, Object> data = getDataTable(mallMemberService.gerRoleReleaseList(roleReleaseDto, request));
+        return new FebsResponse().success().data(data);
+    }
+
+    /**
+     * 创世释放记录-全部记录
+     */
+    @GetMapping("/roleReleaseChild")
+    public FebsResponse roleReleaseChild(QueryRequest request, MallScoreRecord mallScoreRecord, Integer parentId) {
+        if (parentId == null) {
+            ViewMallMemberController.idFromScoreRoleRelease = 0;
+        }
+        mallScoreRecord.setId(ViewMallMemberController.idFromScoreRoleRelease);
+        Map<String, Object> dataTable = getDataTable(mallMemberService.roleReleaseChild(request, mallScoreRecord));
+        return new FebsResponse().success().data(dataTable);
+    }
+
+    /**
+     * 业绩释放记录-列表
+     * @param roleReleaseDto
+     * @param request
+     * @return
+     */
+    @GetMapping("gerAchieveRelease")
+    public FebsResponse gerAchieveRelease(AdminRoleReleaseDto roleReleaseDto, QueryRequest request) {
+        Map<String, Object> data = getDataTable(mallMemberService.gerAchieveReleaseList(roleReleaseDto, request));
+        return new FebsResponse().success().data(data);
+    }
+
+    /**
+     * 业绩释放记录-全部记录
+     */
+    @GetMapping("/achieveReleaseChild")
+    public FebsResponse achieveReleaseChild(QueryRequest request, MallScoreAchieveRelease mallScoreAchieveRelease, Integer parentId) {
+        if (parentId == null) {
+            ViewMallMemberController.idFromScoreAchieveRelease = 0;
+        }
+        mallScoreAchieveRelease.setId(ViewMallMemberController.idFromScoreAchieveRelease);
+        Map<String, Object> dataTable = getDataTable(mallMemberService.achieveReleaseChild(request, mallScoreAchieveRelease));
+        return new FebsResponse().success().data(dataTable);
+    }
+
 }

--
Gitblit v1.9.1