From c5b60fbff8008c95cef0236ea520041a43151d19 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 06 Apr 2023 23:03:13 +0800
Subject: [PATCH] 在mq之前，先更新订单状态

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java |   74 +++++++++++++++++++++++++++++++++++--
 1 files changed, 70 insertions(+), 4 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..dbd1b5e 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -5,16 +5,14 @@
 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 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.*;
 
@@ -99,6 +97,7 @@
      * 会员列表-资金流水
      */
     @GetMapping("/moneyFlow")
+    @RequiresPermissions("moneyFlow:update")
     public FebsResponse moneyFlow(QueryRequest request, MallMember mallMember, Integer parentId) {
         if (parentId == null) {
             ViewMallMemberController.idFromMoneyFlow = 0;
@@ -115,6 +114,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);
     }
 
     /**
@@ -349,6 +358,13 @@
         return new FebsResponse().success().message("操作成功");
     }
 
+    @PostMapping("updateShopApply")
+    @ControllerEndpoint(operation = "商户申请编辑", exceptionMessage = "操作失败")
+    public FebsResponse updateShopApply(@Valid MallShopApply apply) {
+        mallMemberService.updateShopApply(apply);
+        return new FebsResponse().success();
+    }
+
     @PostMapping("/refererIdUpdate")
     @ControllerEndpoint(operation = "修改推荐人", exceptionMessage = "修改失败")
     public FebsResponse refererIdUpdate(MallMember member) {
@@ -368,4 +384,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