From 142bf8ce1392f3a5c0f061ad586c61e310562335 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 26 Jan 2026 14:48:27 +0800
Subject: [PATCH] feat(mall): 添加会员公司申请记录功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 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 9f40d2d..623b186 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}")
@@ -289,6 +293,27 @@
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(
@@ -865,6 +890,8 @@
mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
}
+
+ String memberUuid = mallMember.getMemberUuid();
String companyId = apiXcxSaveInfoDto.getCompanyId();
if(ObjectUtil.isNotEmpty(apiXcxSaveInfoDto.getCompanyId())){
AiCompany aiCompany = aiCompanyMapper.selectOne(
@@ -877,12 +904,18 @@
}
if (ObjectUtil.isNotEmpty(aiCompany)){
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,
@@ -891,7 +924,6 @@
.eq(AiMember::getId, aiMember.getId())
);
}
-
// //完善信息赠送新人礼
// if (StrUtil.isNotBlank(mallMember.getPhone()) && mallMember.getNewGift() == 0) {
--
Gitblit v1.9.1