From c8553669f87a7bc4df3b2279ad4473b6b212a127 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 15 Mar 2023 14:46:42 +0800
Subject: [PATCH] 后台修改

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java |   50 +++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 41 insertions(+), 9 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 9c3f041..a683d78 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -5,15 +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.*;
 
@@ -34,6 +33,7 @@
 
     /**
      * 平台账单
+     *
      * @param mallMember
      * @param request
      * @return
@@ -46,6 +46,7 @@
 
     /**
      * 会员列表
+     *
      * @param mallMember
      * @param request
      * @return
@@ -58,6 +59,7 @@
 
     /**
      * 会员列表---禁止
+     *
      * @param id
      * @return
      */
@@ -69,6 +71,7 @@
 
     /**
      * 会员列表---开启
+     *
      * @param id
      * @return
      */
@@ -78,13 +81,26 @@
         return mallMemberService.openAccount(id);
     }
 
+    @GetMapping("changeIdentityYes/{type}/{id}")
+    public FebsResponse changeIdentityYes(@PathVariable("type") Integer type, @PathVariable("id") Long id) {
+        mallMemberService.changeIdentity(type, id, 1);
+        return new FebsResponse().success();
+    }
+
+    @GetMapping("changeIdentityNo/{type}/{id}")
+    public FebsResponse changeIdentityNo(@PathVariable("type") Integer type, @PathVariable("id") Long id) {
+        mallMemberService.changeIdentity(type, id, 2);
+        return new FebsResponse().success();
+    }
+
     /**
      * 会员列表-资金流水
      */
     @GetMapping("/moneyFlow")
+    @RequiresPermissions("moneyFlow:update")
     public FebsResponse moneyFlow(QueryRequest request, MallMember mallMember, Integer parentId) {
-        if(parentId==null){
-            ViewMallMemberController.idFromMoneyFlow=0;
+        if (parentId == null) {
+            ViewMallMemberController.idFromMoneyFlow = 0;
         }
         mallMember.setId(ViewMallMemberController.idFromMoneyFlow);
         Map<String, Object> dataTable = getDataTable(mallMemberService.moneyFlow(request, mallMember));
@@ -111,6 +127,7 @@
 
     /**
      * 资金流水-列表
+     *
      * @param moneyFlowListDto
      * @param request
      * @return
@@ -123,6 +140,7 @@
 
     /**
      * 会员提现-列表
+     *
      * @param moneyChargeListDto
      * @param request
      * @return
@@ -135,6 +153,7 @@
 
     /**
      * 会员提现-同意
+     *
      * @param id
      * @return
      */
@@ -146,6 +165,7 @@
 
     /**
      * 会员提现-拒绝
+     *
      * @param id
      * @return
      */
@@ -157,6 +177,7 @@
 
     /**
      * 代理列表
+     *
      * @param agentDto
      * @param request
      * @return
@@ -169,6 +190,7 @@
 
     /**
      * 代理级别-列表
+     *
      * @param agentLevelDto
      * @param request
      * @return
@@ -193,7 +215,7 @@
      */
     @GetMapping("getAgentLevelOption/tree")
     @ControllerEndpoint(exceptionMessage = "获取等级失败")
-    public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption(){
+    public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption() {
         return mallMemberService.getAgentLevelOption();
     }
 
@@ -203,8 +225,8 @@
      */
     @GetMapping("/agentChild")
     public FebsResponse agentChild(QueryRequest request, MallMember mallMember, Integer parentId) {
-        if(parentId==null){
-            ViewMallMemberController.idFromAgentAllMember=0;
+        if (parentId == null) {
+            ViewMallMemberController.idFromAgentAllMember = 0;
         }
         mallMember.setId(ViewMallMemberController.idFromAgentAllMember);
         Map<String, Object> dataTable = getDataTable(mallMemberService.agentChild(request, mallMember));
@@ -213,6 +235,7 @@
 
     /**
      * 代理列表---激活
+     *
      * @param id
      * @return
      */
@@ -233,6 +256,7 @@
 
     /**
      * 奖励设置-列表
+     *
      * @param rankAwardDto
      * @param request
      * @return
@@ -254,6 +278,7 @@
 
     /**
      * App版本-列表
+     *
      * @param appVersion
      * @param request
      * @return
@@ -323,6 +348,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) {

--
Gitblit v1.9.1