From 1f7383c5e295f11a66fdfa9b75e596f72b35b4a8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 15 Sep 2022 16:38:51 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 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 25cd8b7..215b2cd 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -10,9 +10,11 @@
import cc.mrbird.febs.mall.entity.MallNewsInfo;
import cc.mrbird.febs.mall.entity.MallShopApply;
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.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -29,9 +31,11 @@
public class AdminMallMemberController extends BaseController {
private final IAdminMallMemberService mallMemberService;
+ private final IApiMallMemberService apiMallMemberService;
/**
* 平台账单
+ *
* @param mallMember
* @param request
* @return
@@ -44,6 +48,7 @@
/**
* 会员列表
+ *
* @param mallMember
* @param request
* @return
@@ -56,6 +61,7 @@
/**
* 会员列表---禁止
+ *
* @param id
* @return
*/
@@ -67,6 +73,7 @@
/**
* 会员列表---开启
+ *
* @param id
* @return
*/
@@ -76,13 +83,25 @@
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")
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));
@@ -109,6 +128,7 @@
/**
* 资金流水-列表
+ *
* @param moneyFlowListDto
* @param request
* @return
@@ -121,6 +141,7 @@
/**
* 会员提现-列表
+ *
* @param moneyChargeListDto
* @param request
* @return
@@ -133,6 +154,7 @@
/**
* 会员提现-同意
+ *
* @param id
* @return
*/
@@ -144,6 +166,7 @@
/**
* 会员提现-拒绝
+ *
* @param id
* @return
*/
@@ -155,6 +178,7 @@
/**
* 代理列表
+ *
* @param agentDto
* @param request
* @return
@@ -167,6 +191,7 @@
/**
* 代理级别-列表
+ *
* @param agentLevelDto
* @param request
* @return
@@ -191,7 +216,7 @@
*/
@GetMapping("getAgentLevelOption/tree")
@ControllerEndpoint(exceptionMessage = "获取等级失败")
- public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption(){
+ public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption() {
return mallMemberService.getAgentLevelOption();
}
@@ -201,8 +226,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));
@@ -211,6 +236,7 @@
/**
* 代理列表---激活
+ *
* @param id
* @return
*/
@@ -231,6 +257,7 @@
/**
* 奖励设置-列表
+ *
* @param rankAwardDto
* @param request
* @return
@@ -252,6 +279,7 @@
/**
* App版本-列表
+ *
* @param appVersion
* @param request
* @return
@@ -296,6 +324,13 @@
return mallMemberService.resetPwd(id);
}
+ @PostMapping(value = "resetPwdNew/{type}/{ids}")
+ @ControllerEndpoint(operation = "重置密码", exceptionMessage = "重置密码失败")
+ public FebsResponse resetPwd(@PathVariable("ids") String ids, @PathVariable("type") Integer type) {
+ mallMemberService.resetPwd(ids, type);
+ return new FebsResponse().success().message("重置成功");
+ }
+
@GetMapping("shopApplyList")
@ControllerEndpoint(operation = "申请通道列表", exceptionMessage = "获取失败")
public FebsResponse shopApplyList(MallShopApply mallShopApply, QueryRequest request) {
@@ -314,4 +349,23 @@
return new FebsResponse().success().message("操作成功");
}
+ @PostMapping("/refererIdUpdate")
+ @ControllerEndpoint(operation = "修改推荐人", exceptionMessage = "修改失败")
+ public FebsResponse refererIdUpdate(MallMember member) {
+ mallMemberService.modifyReferer(member);
+ return new FebsResponse().success();
+ }
+
+ @PostMapping("/memberAdd")
+ public FebsResponse memberAdd(MallMember member) {
+ RegisterDto registerDto = new RegisterDto();
+ registerDto.setAccount(member.getAccount());
+ registerDto.setRegistType("admin");
+ registerDto.setPassword("a123456");
+ registerDto.setInviteId(member.getInviteId());
+ registerDto.setName(member.getName());
+ apiMallMemberService.register(registerDto);
+ return new FebsResponse().success();
+ }
+
}
--
Gitblit v1.9.1