From 327dbf98474aa79974526adf669e51edc72f034b Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 04 Feb 2026 14:50:16 +0800
Subject: [PATCH] feat(mall): 更新会员等级设置功能并集成AI会员服务
---
src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 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 19bd9af..bc9e3c2 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
@@ -1,5 +1,7 @@
package cc.mrbird.febs.mall.controller.member;
+import cc.mrbird.febs.ai.entity.AiMember;
+import cc.mrbird.febs.ai.service.AiMemberService;
import cc.mrbird.febs.common.annotation.ControllerEndpoint;
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
@@ -15,6 +17,7 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -37,6 +40,7 @@
private final IApiMallMemberService apiMallMemberService;
private final IMallVipBenefitsService mallVipBenefitsService;
private final MallVipBenefitsRecordMapper mallVipBenefitsRecordMapper;
+ private final AiMemberService aiMemberService;
/**
* 平台账单
@@ -60,9 +64,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 +609,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);
}
/**
@@ -632,8 +661,17 @@
@PostMapping("vipLevelSetUpdate")
public FebsResponse vipLevelSetUpdate(MallMember member) {
MallMember mallMember = mallMemberService.getBaseMapper().selectById(member.getId());
- mallMember.setDirector(member.getDirector());
- mallMemberService.updateById(mallMember);
+ mallMemberService.update(null,
+ Wrappers.lambdaUpdate(MallMember.class)
+ .set(MallMember::getDirector, member.getDirector())
+ .eq(MallMember::getId, mallMember.getId())
+ );
+ aiMemberService.update(null,
+ Wrappers.lambdaUpdate(AiMember.class)
+ .set(AiMember::getMemberRoleId, member.getDirector())
+ .eq(AiMember::getId, mallMember.getMemberUuid())
+ .eq(AiMember::getCompanyId, mallMember.getCompanyId())
+ );
return new FebsResponse().success().message("操作成功");
}
--
Gitblit v1.9.1