From 49306af1995aec6264410e624bb91db6876f666a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Sep 2025 10:34:47 +0800
Subject: [PATCH] fix(mall):修复小程序登录时公司ID查询错误 - 将查询条件从 apiXcxLoginDto.getCode() 更正为 apiXcxLoginDto.getCompanyId() - 确保公司信息查询使用正确的参数 - 修复因参数错误导致的公司信息无法正确获取的问题
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 e67b607..a523b92 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);
@@ -745,7 +755,11 @@
mallMember = this.baseMapper.selectMemberByOpenId(openId);
String inviteId = ShareCodeUtil.toSerialCode(mallMember.getId());
mallMember.setMemberUuid(aiMember.getId());
+ if (StrUtil.isNotEmpty(aiMember.getCompanyId())){
+ mallMember.setCompanyId(aiMember.getCompanyId());
+ }
mallMember.setInviteId(inviteId);
+ mallMember.setName("新用户"+inviteId);
this.baseMapper.updateById(mallMember);
MallMemberWallet wallet = new MallMemberWallet();
wallet.setBalance(BigDecimal.ZERO);
@@ -846,6 +860,10 @@
if(ObjectUtil.isNotEmpty(apiXcxSaveInfoDto.getGender())){
mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
}
+
+ if(ObjectUtil.isNotEmpty(apiXcxSaveInfoDto.getCompanyId())){
+ mallMember.setCompanyId(apiXcxSaveInfoDto.getCompanyId());
+ }
this.baseMapper.updateById(mallMember);
String memberUuid = mallMember.getMemberUuid();
--
Gitblit v1.9.1