From 8657f3758fa1acef3445f82b82f81fdba5e0c1db Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Sep 2025 11:29:00 +0800
Subject: [PATCH] feat(member): 更新会员公司ID逻辑 - 从API DTO中提取公司ID - 验证并转换公司编码为内部ID - 设置会员关联的公司ID - 优化公司信息查询逻辑 - 修复公司ID更新问题 - 确保会员信息正确绑定公司关系

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   19 ++++++++++++++++---
 1 files changed, 16 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 a523b92..ead6ef1 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
@@ -825,6 +825,7 @@
     }
 
     @Override
+    @Transactional
     public FebsResponse xcxSaveInfo(ApiXcxSaveInfoDto apiXcxSaveInfoDto) {
         log.info("name={},phone={},avatar={},sex={}",
                 apiXcxSaveInfoDto.getNickName(),apiXcxSaveInfoDto.getPhone(),apiXcxSaveInfoDto.getAvatarUrl(),apiXcxSaveInfoDto.getGender());
@@ -861,17 +862,29 @@
             mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
         }
 
+        String companyId = apiXcxSaveInfoDto.getCompanyId();
         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)){
+                companyId = aiCompany.getId();
+            }
         }
+        mallMember.setCompanyId(companyId);
         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