From 0b0ce2eb06961c3670f687e2274d982004dfde41 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Tue, 09 May 2023 09:56:03 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 85 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 0 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 a683d78..af2af3f 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -81,6 +81,30 @@
return mallMemberService.openAccount(id);
}
+ /**
+ * 会员列表---禁止
+ *
+ * @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);
@@ -114,6 +138,16 @@
@ControllerEndpoint(operation = "会员列表-系统拨付", exceptionMessage = "操作失败")
public FebsResponse updateSystemPay(@Valid MallSystemPayDto mallSystemPayDto) {
return mallMemberService.updateSystemPay(mallSystemPayDto);
+ }
+
+ /**
+ * 会员列表-系统拨付绿色凭证
+ */
+ @PostMapping("updateVoucher")
+ @ControllerEndpoint(operation = "会员列表-系统拨付绿色凭证", exceptionMessage = "操作失败")
+ public FebsResponse updateVoucher(@Valid MallSystemPayDto mallSystemPayDto) {
+// return mallMemberService.updateSystemPay(mallSystemPayDto);
+ return mallMemberService.updateVoucher(mallSystemPayDto);
}
/**
@@ -370,8 +404,59 @@
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