refactor(ai): 调整公司ID查询逻辑和端口配置

Administrator

4 days ago cb78ad5f3aa9436cf32ae74f07dd1a5d18b8f046

 src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java

@@ -4,6 +4,7 @@
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;
@@ -32,6 +33,7 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;

/**
@@ -47,8 +49,6 @@

    private final AiMemberRoleMapper aiMemberRoleMapper;
    private final AiCompanyMapper aiCompanyMapper;
    private final MallMemberMapper mallMemberMapper;
    private final AiMemberService aiMemberService;
    private final AiCompanyMemberApplyMapper aiCompanyMemberApplyMapper;

    @Override
@@ -82,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)){
@@ -105,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);
@@ -132,50 +131,6 @@
            }
        }
        return new FebsResponse().success().data(list);
    }

    @Override
    public FebsResponse editCompanyCode(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();
            }
        }

        MallMember mallMember = mallMemberMapper.selectOne(
                Wrappers.lambdaQuery(MallMember.class)
                        .eq(MallMember::getMemberUuid, memberUuid)
                        .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())
            );
        }

        return new FebsResponse().success();
    }

    @Override
@@ -211,6 +166,7 @@
        entity.setMemberId(memberUuid);
        entity.setCompanyCode(aiCompany.getCode());
        entity.setCompanyName(aiCompany.getName());
        entity.setCreatedTime(new Date());
        aiCompanyMemberApplyMapper.insert(entity);

        return new FebsResponse().success();