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 | 143 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 141 insertions(+), 2 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 c253445..9c3f041 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -5,11 +5,13 @@
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.MallOrderRefund;
+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 cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryTreeVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -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);
+ }
/**
* 会员列表
@@ -74,6 +89,24 @@
mallMember.setId(ViewMallMemberController.idFromMoneyFlow);
Map<String, Object> dataTable = getDataTable(mallMemberService.moneyFlow(request, mallMember));
return new FebsResponse().success().data(dataTable);
+ }
+
+ /**
+ * 会员列表-系统拨付
+ */
+ @PostMapping("updateSystemPay")
+ @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);
}
/**
@@ -179,6 +212,26 @@
}
/**
+ * 代理列表---激活
+ * @param id
+ * @return
+ */
+ @GetMapping("activateAccount/{id}")
+ @ControllerEndpoint(operation = "代理列表---激活", exceptionMessage = "操作失败")
+ public FebsResponse activateAccount(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.activateAccount(id);
+ }
+
+ /**
+ * 代理列表-设置代理级别
+ */
+ @PostMapping("agentLevelSetUpdate")
+ @ControllerEndpoint(operation = "代理列表-设置代理级别", exceptionMessage = "操作失败")
+ public FebsResponse agentLevelSetUpdate(@Valid AgentLevelSetUpdateDto agentLevelSetUpdateDto) {
+ return mallMemberService.agentLevelSetUpdate(agentLevelSetUpdateDto);
+ }
+
+ /**
* 奖励设置-列表
* @param rankAwardDto
* @param request
@@ -199,8 +252,94 @@
return mallMemberService.rankAwardUpdate(rankAwardUpdateDto);
}
+ /**
+ * App版本-列表
+ * @param appVersion
+ * @param request
+ * @return
+ */
+ @GetMapping("getAppVersionList")
+ public FebsResponse getAppVersionList(AppVersion appVersion, QueryRequest request) {
+ Map<String, Object> data = getDataTable(mallMemberService.getAppVersionList(appVersion, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * App版本-删除
+ */
+ @GetMapping("delAppVersion/{id}")
+ @ControllerEndpoint(operation = " App版本-删除", exceptionMessage = "操作失败")
+ public FebsResponse delAppVersion(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.delCategary(id);
+ }
+
+ /**
+ * App版本-新增
+ */
+ @PostMapping("addAppVersion")
+ @ControllerEndpoint(operation = " App版本-新增", exceptionMessage = "操作失败")
+ public FebsResponse addAppVersion(@Valid AppVersion appVersion) {
+ return mallMemberService.addAppVersion(appVersion);
+ }
+
+ /**
+ * App版本-更新
+ */
+ @PostMapping("updateAppVersion")
+ @ControllerEndpoint(operation = "App版本-更新", exceptionMessage = "操作失败")
+ public FebsResponse updateAppVersion(@Valid AppVersion appVersion) {
+ return mallMemberService.updateAppVersion(appVersion);
+ }
+ @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")
+ @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