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 | 138 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 129 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 25cd8b7..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,14 +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.*;
@@ -29,9 +29,11 @@
public class AdminMallMemberController extends BaseController {
private final IAdminMallMemberService mallMemberService;
+ private final IApiMallMemberService apiMallMemberService;
/**
* 平台账单
+ *
* @param mallMember
* @param request
* @return
@@ -44,6 +46,7 @@
/**
* 会员列表
+ *
* @param mallMember
* @param request
* @return
@@ -56,6 +59,7 @@
/**
* 会员列表---禁止
+ *
* @param id
* @return
*/
@@ -67,6 +71,7 @@
/**
* 会员列表---开启
+ *
* @param id
* @return
*/
@@ -76,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));
@@ -99,6 +117,16 @@
}
/**
+ * 会员列表-系统拨付绿色凭证
+ */
+ @PostMapping("updateVoucher")
+ @ControllerEndpoint(operation = "会员列表-系统拨付绿色凭证", exceptionMessage = "操作失败")
+ public FebsResponse updateVoucher(@Valid MallSystemPayDto mallSystemPayDto) {
+// return mallMemberService.updateSystemPay(mallSystemPayDto);
+ return mallMemberService.updateVoucher(mallSystemPayDto);
+ }
+
+ /**
* 会员列表-详情更新
*/
@PostMapping("updateMemberInfo")
@@ -109,6 +137,7 @@
/**
* 资金流水-列表
+ *
* @param moneyFlowListDto
* @param request
* @return
@@ -121,6 +150,7 @@
/**
* 会员提现-列表
+ *
* @param moneyChargeListDto
* @param request
* @return
@@ -133,6 +163,7 @@
/**
* 会员提现-同意
+ *
* @param id
* @return
*/
@@ -144,6 +175,7 @@
/**
* 会员提现-拒绝
+ *
* @param id
* @return
*/
@@ -155,6 +187,7 @@
/**
* 代理列表
+ *
* @param agentDto
* @param request
* @return
@@ -167,6 +200,7 @@
/**
* 代理级别-列表
+ *
* @param agentLevelDto
* @param request
* @return
@@ -191,7 +225,7 @@
*/
@GetMapping("getAgentLevelOption/tree")
@ControllerEndpoint(exceptionMessage = "获取等级失败")
- public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption(){
+ public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption() {
return mallMemberService.getAgentLevelOption();
}
@@ -201,8 +235,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 +245,7 @@
/**
* 代理列表---激活
+ *
* @param id
* @return
*/
@@ -231,6 +266,7 @@
/**
* 奖励设置-列表
+ *
* @param rankAwardDto
* @param request
* @return
@@ -252,6 +288,7 @@
/**
* App版本-列表
+ *
* @param appVersion
* @param request
* @return
@@ -296,6 +333,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 +358,80 @@
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) {
+ 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();
+ }
+
+ /**
+ * 创世释放记录-列表
+ * @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