From 6f984093fc3d52ae71788a2eecd0b99c1e13d588 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 19 Feb 2024 14:35:24 +0800
Subject: [PATCH] 文件上传服务器地址
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 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 f0fd5ad..a5f9238 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -4,6 +4,8 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.enumerates.ProductEnum;
+import cc.mrbird.febs.common.utils.ShareCodeUtil;
import cc.mrbird.febs.common.utils.excl.ExcelSheetPO;
import cc.mrbird.febs.common.utils.excl.ExcelUtil;
import cc.mrbird.febs.common.utils.excl.ExcelVersion;
@@ -76,6 +78,12 @@
return new FebsResponse().success().data(data);
}
+ @GetMapping("getFcmMallMemberList")
+ public FebsResponse getFcmMallMemberList(MallMember mallMember, QueryRequest request) {
+ Map<String, Object> data = getDataTable(mallMemberService.getFcmMallMemberList(mallMember, request));
+ return new FebsResponse().success().data(data);
+ }
+
/**
* 会员列表---禁止
*
@@ -98,6 +106,30 @@
@ControllerEndpoint(operation = "会员列表---开启", exceptionMessage = "开启失败")
public FebsResponse openAccount(@NotNull(message = "{required}") @PathVariable Long id) {
return mallMemberService.openAccount(id);
+ }
+
+ /**
+ * 会员列表---冻结
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("frozenWithYes/{id}")
+ @ControllerEndpoint(operation = "冻结", exceptionMessage = "禁止失败")
+ public FebsResponse frozenWithYes(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.frozenWith(id, ProductEnum.MEMBER_FROZEN.getValue());
+ }
+
+ /**
+ * 会员列表---解冻
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("frozenWithNo/{id}")
+ @ControllerEndpoint(operation = "解冻", exceptionMessage = "开启失败")
+ public FebsResponse frozenWithNo(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.frozenWith(id,ProductEnum.MEMBER_UNFROZEN.getValue());
}
/**
@@ -181,6 +213,15 @@
@ControllerEndpoint(operation = "会员列表-系统拨付", exceptionMessage = "操作失败")
public FebsResponse updateSystemPay(@Valid MallSystemPayDto mallSystemPayDto) {
return mallMemberService.updateSystemPay(mallSystemPayDto);
+ }
+
+ /**
+ * 会员列表-系统拨付
+ */
+ @PostMapping("updateSystemPayInfo")
+ @ControllerEndpoint(operation = "会员列表-系统拨付", exceptionMessage = "操作失败")
+ public FebsResponse updateSystemPayInfo(@Valid MallSystemPayDto mallSystemPayDto) {
+ return mallMemberService.updateSystemPayInfo(mallSystemPayDto);
}
/**
@@ -475,11 +516,14 @@
@PostMapping("/memberAdd")
public FebsResponse memberAdd(MallMember member) {
RegisterDto registerDto = new RegisterDto();
- registerDto.setAccount(member.getAccount());
- registerDto.setRegistType("admin");
+ Integer selectCount = mallMemberMapper.selectCount(null);
+ String account = new StringBuilder().append("bbsz").append(ShareCodeUtil.toSerialNumberCode(selectCount)).toString();
+ String key = ShareCodeUtil.toSerialCode(selectCount);
+ registerDto.setAccountLogin(account);
+ registerDto.setUserKey(key);
registerDto.setPassword("a123456");
+ registerDto.setTradePassword("123456");
registerDto.setInviteId(member.getInviteId());
- registerDto.setName(member.getName());
apiMallMemberService.register(registerDto);
return new FebsResponse().success();
}
--
Gitblit v1.9.1