From 5e4afaf5e6aeb6e5418c654ee491bdeb5a01e5e9 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 22 Sep 2025 18:02:53 +0800
Subject: [PATCH] feat(ai): 新增公司工作流实体类及Mapper接口
---
src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java
index 800f122..0a71bf1 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java
@@ -60,9 +60,25 @@
*/
@GetMapping("getMallMemberList")
public FebsResponse getMallMemberList(MallMember mallMember, QueryRequest request) {
+
+ String companyId = getCurrentUserCompanyId();
+ mallMember.setCompanyId(companyId);
Map<String, Object> data = getDataTable(mallMemberService.getMallMemberList(mallMember, request));
return new FebsResponse().success().data(data);
}
+
+// /**
+// * 会员列表
+// *
+// * @param mallMember
+// * @param request
+// * @return
+// */
+// @GetMapping("getMallMemberList")
+// public FebsResponse getMallMemberList(MallMember mallMember, QueryRequest request) {
+// Map<String, Object> data = getDataTable(mallMemberService.getMallMemberList(mallMember, request));
+// return new FebsResponse().success().data(data);
+// }
/**
* 会员列表---禁止
@@ -589,12 +605,21 @@
}
/**
- * 会员列表-核销员设置
+ * 会员列表-活动核销员设置
*/
@GetMapping("checkOrder/{id}")
@ControllerEndpoint(operation = " 会员列表-核销员设置", exceptionMessage = "操作失败")
public FebsResponse checkOrder(@NotNull(message = "{required}") @PathVariable Long id) {
return mallMemberService.checkOrder(id);
+ }
+
+ /**
+ * 会员列表-自提核销核销员设置
+ */
+ @GetMapping("checkLeader/{id}")
+ @ControllerEndpoint(operation = " 会员列表-自提核销员设置", exceptionMessage = "操作失败")
+ public FebsResponse checkLeader(@NotNull(message = "{required}") @PathVariable Long id) {
+ return mallMemberService.checkLeader(id);
}
/**
@@ -631,8 +656,17 @@
@PostMapping("vipLevelSetUpdate")
public FebsResponse vipLevelSetUpdate(MallMember member) {
- member.setVipLevelTime(new Date());
- mallMemberService.updateById(member);
+ MallMember mallMember = mallMemberService.getBaseMapper().selectById(member.getId());
+ mallMember.setDirector(member.getDirector());
+ mallMemberService.updateById(mallMember);
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @PostMapping("saleLevelSetUpdate")
+ public FebsResponse saleLevelSetUpdate(MallMember member) {
+ MallMember mallMember = mallMemberService.getBaseMapper().selectById(member.getId());
+ mallMember.setStoreMaster(member.getStoreMaster());
+ mallMemberService.updateById(mallMember);
return new FebsResponse().success().message("操作成功");
}
--
Gitblit v1.9.1