From 49fe1148047aa0038392cda01473742c27bb217b Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 28 Jan 2026 10:00:28 +0800
Subject: [PATCH] refactor(mall): 移除会员公司ID关联逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 63 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 13 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index ca4046f..25889dd 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -1,8 +1,11 @@
package cc.mrbird.febs.mall.service.impl;
import cc.mrbird.febs.ai.entity.AiCompany;
+import cc.mrbird.febs.ai.entity.AiCompanyMemberApply;
import cc.mrbird.febs.ai.entity.AiMember;
+import cc.mrbird.febs.ai.enumerates.AiCommonEnum;
import cc.mrbird.febs.ai.mapper.AiCompanyMapper;
+import cc.mrbird.febs.ai.mapper.AiCompanyMemberApplyMapper;
import cc.mrbird.febs.ai.mapper.AiMemberMapper;
import cc.mrbird.febs.ai.service.AiMemberService;
import cc.mrbird.febs.ai.utils.UUID;
@@ -109,6 +112,7 @@
private final HappyMemberLabelMapper happyMemberLabelMapper;
private final FebsConfigure febsConfigure;
private final AiMemberService aiMemberService;
+ private final AiCompanyMemberApplyMapper aiCompanyMemberApplyMapper;
@Value("${spring.profiles.active}")
@@ -285,8 +289,32 @@
MallMember mallMember = this.baseMapper.selectById(id);
-
MallMemberVo mallMemberVo = MallMemberConversion.INSTANCE.entityToVo(mallMember);
+ if (StrUtil.isNotEmpty(mallMember.getCompanyId())){
+ AiCompany aiCompany = aiCompanyMapper.selectById(mallMember.getCompanyId());
+ mallMemberVo.setCompanyName(aiCompany.getName());
+ mallMemberVo.setCompanyCode(aiCompany.getCode());
+ }
+
+ List<AiCompanyMemberApply> aiCompanyMemberApplies = aiCompanyMemberApplyMapper.selectList(
+ Wrappers.lambdaQuery(AiCompanyMemberApply.class)
+ .eq(AiCompanyMemberApply::getMemberId, mallMemberVo.getMemberUuid())
+ .in(AiCompanyMemberApply::getState, Arrays.asList(0, 1))
+ );
+ if (CollUtil.isEmpty(aiCompanyMemberApplies)){
+ mallMemberVo.setCompanyApplyState(0);
+ }else{
+ List<AiCompanyMemberApply> aiCompanyMemberApplyList = aiCompanyMemberApplyMapper.selectList(
+ Wrappers.lambdaQuery(AiCompanyMemberApply.class)
+ .eq(AiCompanyMemberApply::getMemberId, mallMemberVo.getMemberUuid())
+ .eq(AiCompanyMemberApply::getState, 0)
+ );
+ if (CollUtil.isNotEmpty(aiCompanyMemberApplyList)){
+ mallMemberVo.setCompanyApplyState(2);
+ }else{
+ mallMemberVo.setCompanyApplyState(1);
+ }
+ }
HappyMemberLevel happyMemberLevel = happyMemberLevelMapper.selectOne(
new LambdaQueryWrapper<HappyMemberLevel>()
@@ -862,6 +890,9 @@
mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
}
+
+ String memberUuid = mallMember.getMemberUuid();
+ String companyId = apiXcxSaveInfoDto.getCompanyId();
if(ObjectUtil.isNotEmpty(apiXcxSaveInfoDto.getCompanyId())){
AiCompany aiCompany = aiCompanyMapper.selectOne(
Wrappers.lambdaQuery(AiCompany.class)
@@ -872,21 +903,27 @@
throw new FebsException("公司编码不存在");
}
if (ObjectUtil.isNotEmpty(aiCompany)){
- mallMember.setCompanyId(aiCompany.getId());
+ companyId = aiCompany.getId();
+
+ AiCompanyMemberApply aiCompanyMemberApply = new AiCompanyMemberApply();
+ aiCompanyMemberApply.setMemberId(memberUuid);
+ aiCompanyMemberApply.setCompanyCode(aiCompany.getCode());
+ aiCompanyMemberApply.setCompanyName(aiCompany.getName());
+ aiCompanyMemberApply.setState(0);
+ aiCompanyMemberApply.setCreatedTime(new Date());
+ aiCompanyMemberApplyMapper.insert(aiCompanyMemberApply);
}
}
+// mallMember.setCompanyId(companyId);
this.baseMapper.updateById(mallMember);
-
- String memberUuid = mallMember.getMemberUuid();
- AiMember aiMember = aiMemberService.getById(memberUuid);
- if (ObjectUtil.isNotEmpty(aiMember) && StrUtil.isNotEmpty(mallMember.getCompanyId())){
- aiMemberService.update(null,
- Wrappers.lambdaUpdate(AiMember.class)
- .set(AiMember::getCompanyId, mallMember.getCompanyId())
- .eq(AiMember::getId, aiMember.getId())
- );
- }
-
+// AiMember aiMember = aiMemberService.getById(memberUuid);
+// if (ObjectUtil.isNotEmpty(aiMember) && StrUtil.isNotEmpty(mallMember.getCompanyId())){
+// aiMemberService.update(null,
+// Wrappers.lambdaUpdate(AiMember.class)
+// .set(AiMember::getCompanyId, mallMember.getCompanyId())
+// .eq(AiMember::getId, aiMember.getId())
+// );
+// }
// //完善信息赠送新人礼
// if (StrUtil.isNotBlank(mallMember.getPhone()) && mallMember.getNewGift() == 0) {
--
Gitblit v1.9.1