From cf0acf91076a0a0f720adbbe486cc5d7f3d1d3f9 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Tue, 25 Apr 2023 16:26:22 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 210 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 163 insertions(+), 47 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 046f5d6..af2af3f 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
*/
@@ -77,12 +82,49 @@
}
/**
+ * 会员列表---禁止
+ *
+ * @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);
+ 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,7 +141,27 @@
}
/**
+ * 会员列表-系统拨付绿色凭证
+ */
+ @PostMapping("updateVoucher")
+ @ControllerEndpoint(operation = "会员列表-系统拨付绿色凭证", exceptionMessage = "操作失败")
+ public FebsResponse updateVoucher(@Valid MallSystemPayDto mallSystemPayDto) {
+// return mallMemberService.updateSystemPay(mallSystemPayDto);
+ return mallMemberService.updateVoucher(mallSystemPayDto);
+ }
+
+ /**
+ * 会员列表-详情更新
+ */
+ @PostMapping("updateMemberInfo")
+ @ControllerEndpoint(operation = "会员列表-详情更新", exceptionMessage = "操作失败")
+ public FebsResponse updateMemberInfo(@Valid MallUpdateMemberInfoDto mallUpdateMemberInfoDto) {
+ return mallMemberService.updateMemberInfo(mallUpdateMemberInfoDto);
+ }
+
+ /**
* 资金流水-列表
+ *
* @param moneyFlowListDto
* @param request
* @return
@@ -112,6 +174,7 @@
/**
* 会员提现-列表
+ *
* @param moneyChargeListDto
* @param request
* @return
@@ -124,6 +187,7 @@
/**
* 会员提现-同意
+ *
* @param id
* @return
*/
@@ -135,6 +199,7 @@
/**
* 会员提现-拒绝
+ *
* @param id
* @return
*/
@@ -146,6 +211,7 @@
/**
* 代理列表
+ *
* @param agentDto
* @param request
* @return
@@ -158,6 +224,7 @@
/**
* 代理级别-列表
+ *
* @param agentLevelDto
* @param request
* @return
@@ -182,7 +249,7 @@
*/
@GetMapping("getAgentLevelOption/tree")
@ControllerEndpoint(exceptionMessage = "获取等级失败")
- public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption(){
+ public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption() {
return mallMemberService.getAgentLevelOption();
}
@@ -192,8 +259,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));
@@ -202,6 +269,7 @@
/**
* 代理列表---激活
+ *
* @param id
* @return
*/
@@ -222,6 +290,7 @@
/**
* 奖励设置-列表
+ *
* @param rankAwardDto
* @param request
* @return
@@ -243,6 +312,7 @@
/**
* App版本-列表
+ *
* @param appVersion
* @param request
* @return
@@ -280,49 +350,18 @@
return mallMemberService.updateAppVersion(appVersion);
}
- /**
- * 新闻中心-列表
- * @param mallNewsInfo
- * @param request
- * @return
- */
- @GetMapping("getNewInfoList")
- public FebsResponse getNewInfoList(MallNewsInfo mallNewsInfo, QueryRequest request) {
- Map<String, Object> data = getDataTable(mallMemberService.getNewInfoList(mallNewsInfo, request));
- return new FebsResponse().success().data(data);
- }
-
- /**
- * 新闻中心-新增
- */
- @PostMapping("addNewsInfo")
- @ControllerEndpoint(operation = " 新闻中心-新增", exceptionMessage = "操作失败")
- public FebsResponse addNewsInfo(@Valid MallNewsInfoDto mallNewsInfoDto) {
- return mallMemberService.addNewsInfo(mallNewsInfoDto);
- }
-
- /**
- * 新闻中心-删除
- */
- @GetMapping("delNewsInfo/{id}")
- @ControllerEndpoint(operation = " 新闻中心-删除", exceptionMessage = "操作失败")
- public FebsResponse delNewsInfo(@NotNull(message = "{required}") @PathVariable Long id) {
- return mallMemberService.delNewsInfo(id);
- }
-
- /**
- * 新闻中心-更新
- */
- @PostMapping("updateNewsInfo")
- @ControllerEndpoint(operation = "新闻中心-更新", exceptionMessage = "操作失败")
- public FebsResponse updateNewsInfo(@Valid MallNewsInfoDto mallNewsInfoDto) {
- return mallMemberService.updateNewsInfo(mallNewsInfoDto);
- }
@PostMapping("resetPwd/{id}")
@ControllerEndpoint(operation = "会员列表---重置密码", exceptionMessage = "重置密码失败")
public FebsResponse resetPwd(@PathVariable("id") Long id) {
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")
@@ -343,4 +382,81 @@
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());
+ registerDto.setSex(member.getSex());
+ 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