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 | 76 +++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 9 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 2709a51..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,6 +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;
@@ -71,6 +76,7 @@
@RequiredArgsConstructor
public class ApiMallMemberServiceImpl extends ServiceImpl<MallMemberMapper, MallMember> implements IApiMallMemberService {
+ private final AiCompanyMapper aiCompanyMapper;
private final AiMemberMapper aiMemberMapper;
private final MallMemberWalletMapper mallMemberWalletMapper;
private final ICommonService commonService;
@@ -106,6 +112,7 @@
private final HappyMemberLabelMapper happyMemberLabelMapper;
private final FebsConfigure febsConfigure;
private final AiMemberService aiMemberService;
+ private final AiCompanyMemberApplyMapper aiCompanyMemberApplyMapper;
@Value("${spring.profiles.active}")
@@ -282,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>()
@@ -737,7 +768,14 @@
AiMember aiMember = new AiMember();
aiMember.setId(UUID.getSimpleUUIDString());
if (StrUtil.isNotEmpty(apiXcxLoginDto.getCompanyId())){
- aiMember.setCompanyId(apiXcxLoginDto.getCompanyId());
+ AiCompany aiCompany = aiCompanyMapper.selectOne(
+ Wrappers.lambdaQuery(AiCompany.class)
+ .eq(AiCompany::getCode, apiXcxLoginDto.getCompanyId())
+ .last("limit 1")
+ );
+ if (ObjectUtil.isNotEmpty(aiCompany)){
+ aiMember.setCompanyId(aiCompany.getId());
+ }
}
aiMember.setCreatedTime(new Date());
aiMemberMapper.insert(aiMember);
@@ -815,6 +853,7 @@
}
@Override
+ @Transactional
public FebsResponse xcxSaveInfo(ApiXcxSaveInfoDto apiXcxSaveInfoDto) {
log.info("name={},phone={},avatar={},sex={}",
apiXcxSaveInfoDto.getNickName(),apiXcxSaveInfoDto.getPhone(),apiXcxSaveInfoDto.getAvatarUrl(),apiXcxSaveInfoDto.getGender());
@@ -851,21 +890,40 @@
mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
}
- if(ObjectUtil.isNotEmpty(apiXcxSaveInfoDto.getCompanyId())){
- mallMember.setCompanyId(apiXcxSaveInfoDto.getCompanyId());
- }
- this.baseMapper.updateById(mallMember);
String memberUuid = mallMember.getMemberUuid();
+ String companyId = apiXcxSaveInfoDto.getCompanyId();
+ if(ObjectUtil.isNotEmpty(apiXcxSaveInfoDto.getCompanyId())){
+ AiCompany aiCompany = aiCompanyMapper.selectOne(
+ Wrappers.lambdaQuery(AiCompany.class)
+ .eq(AiCompany::getCode, apiXcxSaveInfoDto.getCompanyId())
+ .last("limit 1")
+ );
+ if (ObjectUtil.isEmpty(aiCompany)){
+ throw new FebsException("公司编码不存在");
+ }
+ 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);
AiMember aiMember = aiMemberService.getById(memberUuid);
- if (ObjectUtil.isNotEmpty(aiMember) && StrUtil.isNotEmpty(apiXcxSaveInfoDto.getCompanyId())){
+ if (ObjectUtil.isNotEmpty(aiMember) && StrUtil.isNotEmpty(mallMember.getCompanyId())){
aiMemberService.update(null,
Wrappers.lambdaUpdate(AiMember.class)
- .set(AiMember::getCompanyId, aiMember.getCompanyId())
+ .set(AiMember::getCompanyId, mallMember.getCompanyId())
.eq(AiMember::getId, aiMember.getId())
);
}
-
// //完善信息赠送新人礼
// if (StrUtil.isNotBlank(mallMember.getPhone()) && mallMember.getNewGift() == 0) {
--
Gitblit v1.9.1