From c515cd9ac4fa1e75d59689b894a979421a752f60 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 18 Mar 2026 11:49:40 +0800
Subject: [PATCH] fix(mall): 修复小程序登录公司验证逻辑

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |    9 +++++----
 1 files changed, 5 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 6a585ee..db8de3e 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
@@ -704,6 +704,7 @@
     private final YHAiCompanyMapper yhAiCompanyMapper;
 
     @Override
+    @Transactional
     public FebsResponse xcxLogin(ApiXcxLoginDto apiXcxLoginDto) throws IOException {
         log.info("登录请求参数:{}", JSONObject.toJSONString(apiXcxLoginDto));
         FebsResponse febsResponse = new FebsResponse();
@@ -743,9 +744,10 @@
                                 Wrappers.lambdaQuery(YHAiCompany.class)
                                         .eq(YHAiCompany::getCode, apiXcxLoginDto.getCompanyId())
                         );
-                        if (ObjectUtil.isNotEmpty(aiCompany)){
-                            entity.setCompanyId(aiCompany.getId());
+                        if (ObjectUtil.isEmpty(aiCompany)){
+                            throw new FebsException("公司编码错误");
                         }
+                        entity.setCompanyId(aiCompany.getId());
                     }
                     entity.setCreateTime(systemTime);
                     entity.setUpdateTime(systemTime);
@@ -758,7 +760,6 @@
                     );
                     String inviteId = ShareCodeUtil.toSerialCode(entity.getId());
                     entity.setInviteId(inviteId);
-                    entity.setName("XCX"+inviteId);
                     yhAiMemberMapper.updateById(entity);
                 } else {
                     if ("1".equals(entity.getAccountStatus())) {
@@ -798,7 +799,7 @@
     public FebsResponse xcxSaveInfo(ApiXcxSaveInfoDto apiXcxSaveInfoDto) {
         log.info("name={},phone={},avatar={},sex={}",
                 apiXcxSaveInfoDto.getNickName(),apiXcxSaveInfoDto.getPhone(),apiXcxSaveInfoDto.getAvatarUrl(),apiXcxSaveInfoDto.getGender());
-        String memberId = LoginUserUtil.getLoginUser().getMemberUuid();
+        String memberId = YHLoginUserUtil.getLoginUser().getMemberUuid();
         YhAiMember entity = yhAiMemberMapper.selectOne(
                 Wrappers.lambdaQuery(YhAiMember.class)
                         .eq(YhAiMember::getMemberUuid, memberId)

--
Gitblit v1.9.1