Administrator
2025-10-23 ca5d751375dc73203fc542fc7c548f97910c43eb
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>()
@@ -862,6 +889,7 @@
            mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
        }
        String companyId = apiXcxSaveInfoDto.getCompanyId();
        if(ObjectUtil.isNotEmpty(apiXcxSaveInfoDto.getCompanyId())){
            AiCompany aiCompany = aiCompanyMapper.selectOne(
                    Wrappers.lambdaQuery(AiCompany.class)
@@ -872,9 +900,10 @@
                throw new FebsException("公司编码不存在");
            }
            if (ObjectUtil.isNotEmpty(aiCompany)){
                mallMember.setCompanyId(aiCompany.getId());
                companyId = aiCompany.getId();
            }
        }
        mallMember.setCompanyId(companyId);
        this.baseMapper.updateById(mallMember);
        String memberUuid = mallMember.getMemberUuid();