From 753df81a02287acd5af16ef83eccd0a295530584 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 30 Oct 2025 10:46:36 +0800
Subject: [PATCH] feat(ai): 简化AI对话项创建逻辑并新增连续对话类型 - 移除复杂的对话项更新逻辑，统一通过add方法创建新项 - 新增AiTalkOutputEnum枚举值CONTEXT_TALK用于AI陪练连续对话 - 更新ApiMemberTalkAnswerSavaDto注释以包含新的对话类型 - 修复对话项创建时类型参数未正确传递的问题 - 优化代码结构，减少冗余的条件判断和数据转换操作
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 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 72e82f2..d7a404e 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,8 +1,10 @@
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.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;
@@ -109,6 +111,7 @@
private final HappyMemberLabelMapper happyMemberLabelMapper;
private final FebsConfigure febsConfigure;
private final AiMemberService aiMemberService;
+ private final AiCompanyMemberApplyMapper aiCompanyMemberApplyMapper;
@Value("${spring.profiles.active}")
@@ -285,8 +288,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>()
@@ -742,7 +769,7 @@
if (StrUtil.isNotEmpty(apiXcxLoginDto.getCompanyId())){
AiCompany aiCompany = aiCompanyMapper.selectOne(
Wrappers.lambdaQuery(AiCompany.class)
- .eq(AiCompany::getCode, apiXcxLoginDto.getCode())
+ .eq(AiCompany::getCode, apiXcxLoginDto.getCompanyId())
.last("limit 1")
);
if (ObjectUtil.isNotEmpty(aiCompany)){
@@ -825,6 +852,7 @@
}
@Override
+ @Transactional
public FebsResponse xcxSaveInfo(ApiXcxSaveInfoDto apiXcxSaveInfoDto) {
log.info("name={},phone={},avatar={},sex={}",
apiXcxSaveInfoDto.getNickName(),apiXcxSaveInfoDto.getPhone(),apiXcxSaveInfoDto.getAvatarUrl(),apiXcxSaveInfoDto.getGender());
@@ -861,17 +889,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