From ec97abaae5a0d93e9b4d5f3f82de7b97f2b586b0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 11 Jun 2022 20:22:15 +0800
Subject: [PATCH] fix some problem and add update referer and add member
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 104 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 66 insertions(+), 38 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 e154175..9c3f041 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -8,7 +8,9 @@
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.service.IAdminMallMemberService;
+import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.vo.AdminAgentLevelOptionTreeVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -28,6 +30,19 @@
public class AdminMallMemberController extends BaseController {
private final IAdminMallMemberService mallMemberService;
+ private final IApiMallMemberService apiMallMemberService;
+
+ /**
+ * 平台账单
+ * @param mallMember
+ * @param request
+ * @return
+ */
+ @GetMapping("getMallDataList")
+ public FebsResponse getMallDataList(MallMember mallMember, QueryRequest request) {
+ Map<String, Object> data = getDataTable(mallMemberService.getMallDataList(mallMember, request));
+ return new FebsResponse().success().data(data);
+ }
/**
* 会员列表
@@ -83,6 +98,15 @@
@ControllerEndpoint(operation = "会员列表-系统拨付", exceptionMessage = "操作失败")
public FebsResponse updateSystemPay(@Valid MallSystemPayDto mallSystemPayDto) {
return mallMemberService.updateSystemPay(mallSystemPayDto);
+ }
+
+ /**
+ * 会员列表-详情更新
+ */
+ @PostMapping("updateMemberInfo")
+ @ControllerEndpoint(operation = "会员列表-详情更新", exceptionMessage = "操作失败")
+ public FebsResponse updateMemberInfo(@Valid MallUpdateMemberInfoDto mallUpdateMemberInfoDto) {
+ return mallMemberService.updateMemberInfo(mallUpdateMemberInfoDto);
}
/**
@@ -267,44 +291,6 @@
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 = "重置密码失败")
@@ -312,6 +298,48 @@
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) {
+ return new FebsResponse().success().data(getDataTable(mallMemberService.findShopApplyListInPage(mallShopApply, request)));
+ }
+
+ @PostMapping("applyCheckAgree/{id}")
+ public FebsResponse applyCheckAgree(@PathVariable Long id) {
+ mallMemberService.applyCheckAgree(id);
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @PostMapping(value = "applyCheckDisAgree/{id}")
+ public FebsResponse applyCheckDisAgree(@PathVariable Long id) {
+ mallMemberService.applyCheckDisAgree(id);
+ 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