fix(mall): 修复会员公司ID设置逻辑

Administrator

11 hours ago 9519a6c1fc7ed4e0ca3f4bafa6f190901adb64f8

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java

@@ -1,8 +1,11 @@
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.enumerates.AiCommonEnum;
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 +112,7 @@
    private final HappyMemberLabelMapper happyMemberLabelMapper;
    private final FebsConfigure febsConfigure;
    private final AiMemberService aiMemberService;
    private final AiCompanyMemberApplyMapper aiCompanyMemberApplyMapper;


    @Value("${spring.profiles.active}")
@@ -290,6 +294,26 @@
            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(
@@ -879,6 +903,9 @@
            if (ObjectUtil.isNotEmpty(aiCompany)){
                companyId = aiCompany.getId();
            }
        }else{

            companyId = AiCommonEnum.COMPANY_ID.getPrompt();
        }
        mallMember.setCompanyId(companyId);
        this.baseMapper.updateById(mallMember);