From eea4def7d653d421b52903521e8121c9d9ab0986 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Sep 2025 11:20:48 +0800
Subject: [PATCH] feat(mall): 添加事务注解并校验公司编码 - 在 xcxSaveInfo 方法上添加 @Transactional 注解 - 校验公司编码是否存在,不存在则抛出异常 - 优化公司信息查询逻辑,确保数据一致性

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 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..ca4046f 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,8 @@
 package cc.mrbird.febs.mall.service.impl;
 
+import cc.mrbird.febs.ai.entity.AiCompany;
 import cc.mrbird.febs.ai.entity.AiMember;
+import cc.mrbird.febs.ai.mapper.AiCompanyMapper;
 import cc.mrbird.febs.ai.mapper.AiMemberMapper;
 import cc.mrbird.febs.ai.service.AiMemberService;
 import cc.mrbird.febs.ai.utils.UUID;
@@ -71,6 +73,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;
@@ -737,7 +740,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 +825,7 @@
     }
 
     @Override
+    @Transactional
     public FebsResponse xcxSaveInfo(ApiXcxSaveInfoDto apiXcxSaveInfoDto) {
         log.info("name={},phone={},avatar={},sex={}",
                 apiXcxSaveInfoDto.getNickName(),apiXcxSaveInfoDto.getPhone(),apiXcxSaveInfoDto.getAvatarUrl(),apiXcxSaveInfoDto.getGender());
@@ -852,16 +863,26 @@
         }
 
         if(ObjectUtil.isNotEmpty(apiXcxSaveInfoDto.getCompanyId())){
-            mallMember.setCompanyId(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)){
+                mallMember.setCompanyId(aiCompany.getId());
+            }
         }
         this.baseMapper.updateById(mallMember);
 
         String memberUuid = mallMember.getMemberUuid();
         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())
                     );
         }

--
Gitblit v1.9.1