From cb78ad5f3aa9436cf32ae74f07dd1a5d18b8f046 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 08 Jan 2026 13:44:41 +0800
Subject: [PATCH] refactor(ai): 调整公司ID查询逻辑和端口配置
---
src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java | 78 +++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 40 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java
index bf295be..db45b2e 100644
--- a/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java
@@ -1,9 +1,12 @@
package cc.mrbird.febs.ai.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.entity.AiMemberRole;
+import cc.mrbird.febs.ai.enumerates.AiCommonEnum;
import cc.mrbird.febs.ai.mapper.AiCompanyMapper;
+import cc.mrbird.febs.ai.mapper.AiCompanyMemberApplyMapper;
import cc.mrbird.febs.ai.mapper.AiMemberRoleMapper;
import cc.mrbird.febs.ai.req.company.ApiCompanyCodeEditDto;
import cc.mrbird.febs.ai.req.memberAnswer.ApiMemberAnswerDto;
@@ -29,6 +32,8 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
import java.util.List;
/**
@@ -44,8 +49,7 @@
private final AiMemberRoleMapper aiMemberRoleMapper;
private final AiCompanyMapper aiCompanyMapper;
- private final MallMemberMapper mallMemberMapper;
- private final AiMemberService aiMemberService;
+ private final AiCompanyMemberApplyMapper aiCompanyMemberApplyMapper;
@Override
public List<AiMemberRole> getListByQuery(LambdaQueryWrapper<AiMemberRole> query) {
@@ -78,11 +82,10 @@
List<ApiMemberRoleVo> list = new ArrayList<>();
LambdaQueryWrapper<AiMemberRole> query = Wrappers.lambdaQuery(AiMemberRole.class);
- if (StrUtil.isNotEmpty(dto.getCompanyId())){
- query.eq(AiMemberRole::getCompanyId, dto.getCompanyId());
- }else{
- query.isNull(AiMemberRole::getCompanyId);
+ if (StrUtil.isBlank(dto.getCompanyId())){
+ dto.setCompanyId(AiCommonEnum.COMPANY_ID.getPrompt());
}
+ query.eq(AiMemberRole::getCompanyId, dto.getCompanyId());
query.eq(AiMemberRole::getState, 1);
List<AiMemberRole> listByQuery = this.getListByQuery(query);
if (CollUtil.isNotEmpty(listByQuery)){
@@ -101,7 +104,7 @@
public String getDefaultMemberRoleId() {
LambdaQueryWrapper<AiMemberRole> queryWrapper = Wrappers.lambdaQuery(AiMemberRole.class);
queryWrapper.eq(AiMemberRole::getState, 1);
- queryWrapper.isNull(AiMemberRole::getCompanyId);
+ queryWrapper.eq(AiMemberRole::getCompanyId, AiCommonEnum.COMPANY_ID.getPrompt());
queryWrapper.orderByAsc(AiMemberRole::getCreatedTime);
queryWrapper.last("limit 1");
List<AiMemberRole> listByQuery = this.getListByQuery(queryWrapper);
@@ -131,46 +134,41 @@
}
@Override
- public FebsResponse editCompanyCode(ApiCompanyCodeEditDto dto) {
-
+ public FebsResponse applyCompanyCode(ApiCompanyCodeEditDto dto) {
String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
- String companyId = dto.getCompanyCode();
- if(ObjectUtil.isNotEmpty(dto.getCompanyCode())){
- AiCompany aiCompany = aiCompanyMapper.selectOne(
- Wrappers.lambdaQuery(AiCompany.class)
- .eq(AiCompany::getCode, dto.getCompanyCode())
- .last("limit 1")
- );
- if (ObjectUtil.isEmpty(aiCompany)){
- throw new FebsException("公司编码不存在");
- }
- if (ObjectUtil.isNotEmpty(aiCompany)){
- companyId = aiCompany.getId();
- }
- }
+ String companyCode = dto.getCompanyCode();
+ if (StrUtil.isBlank(companyCode)){
+ throw new FebsException("请选择公司");
- MallMember mallMember = mallMemberMapper.selectOne(
- Wrappers.lambdaQuery(MallMember.class)
- .eq(MallMember::getMemberUuid, memberUuid)
+ }
+ AiCompany aiCompany = aiCompanyMapper.selectOne(
+ Wrappers.lambdaQuery(AiCompany.class)
+ .eq(AiCompany::getCode, dto.getCompanyCode())
.last("limit 1")
);
- mallMember.setCompanyId(companyId);
- mallMemberMapper.update(null,
- Wrappers.lambdaUpdate(MallMember.class)
- .set(MallMember::getCompanyId, companyId)
- .eq(MallMember::getId, mallMember.getId())
- );
-
- AiMember aiMember = aiMemberService.getById(memberUuid);
- if (ObjectUtil.isNotEmpty(aiMember) && StrUtil.isNotEmpty(mallMember.getCompanyId())){
- aiMemberService.update(null,
- Wrappers.lambdaUpdate(AiMember.class)
- .set(AiMember::getCompanyId, mallMember.getCompanyId())
- .eq(AiMember::getId, aiMember.getId())
- );
+ if (ObjectUtil.isEmpty(aiCompany)){
+ throw new FebsException("公司编码不存在");
}
+ List<Integer> stateList = Arrays.asList(0, 1);
+
+ List<AiCompanyMemberApply> aiCompanyMemberApplies = aiCompanyMemberApplyMapper.selectList(
+ Wrappers.lambdaQuery(AiCompanyMemberApply.class)
+ .eq(AiCompanyMemberApply::getMemberId, memberUuid)
+ .in(AiCompanyMemberApply::getState, stateList)
+ );
+ if (CollUtil.isNotEmpty(aiCompanyMemberApplies)){
+ throw new FebsException("您已申请过公司，请勿重复申请");
+ }
+
+ AiCompanyMemberApply entity = new AiCompanyMemberApply();
+ entity.setMemberId(memberUuid);
+ entity.setCompanyCode(aiCompany.getCode());
+ entity.setCompanyName(aiCompany.getName());
+ entity.setCreatedTime(new Date());
+ aiCompanyMemberApplyMapper.insert(entity);
+
return new FebsResponse().success();
}
}
--
Gitblit v1.9.1