src/main/java/cc/mrbird/febs/ai/controller/company/ApiCompanyController.java
@@ -45,7 +45,7 @@ @PostMapping(value = "/editCompanyCode") public FebsResponse editCompanyCode(@RequestBody @Validated ApiCompanyCodeEditDto dto) { return aiMemberRoleService.editCompanyCode(dto); return aiMemberRoleService.applyCompanyCode(dto); } } src/main/java/cc/mrbird/febs/ai/service/AiMemberRoleService.java
@@ -29,4 +29,6 @@ FebsResponse companyList(); FebsResponse editCompanyCode(ApiCompanyCodeEditDto dto); FebsResponse applyCompanyCode(ApiCompanyCodeEditDto dto); } src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberRoleServiceImpl.java
@@ -1,9 +1,11 @@ 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.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 +31,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Arrays; import java.util.List; /** @@ -46,6 +49,7 @@ private final AiCompanyMapper aiCompanyMapper; private final MallMemberMapper mallMemberMapper; private final AiMemberService aiMemberService; private final AiCompanyMemberApplyMapper aiCompanyMemberApplyMapper; @Override public List<AiMemberRole> getListByQuery(LambdaQueryWrapper<AiMemberRole> query) { @@ -173,4 +177,42 @@ return new FebsResponse().success(); } @Override public FebsResponse applyCompanyCode(ApiCompanyCodeEditDto dto) { String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid(); String companyCode = dto.getCompanyCode(); if (StrUtil.isBlank(companyCode)){ throw new FebsException("请选择公司"); } AiCompany aiCompany = aiCompanyMapper.selectOne( Wrappers.lambdaQuery(AiCompany.class) .eq(AiCompany::getCode, dto.getCompanyCode()) .last("limit 1") ); 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()); aiCompanyMemberApplyMapper.insert(entity); return new FebsResponse().success(); } } 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}") @@ -292,6 +295,26 @@ 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>() .select(HappyMemberLevel::getName, HappyMemberLevel::getIconPng) src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -22,6 +22,9 @@ @ApiModelProperty(value = "昵称") private String name; @ApiModelProperty(value = "公司申请状态 0-待申请 1-同意 2-申请中") private Integer companyApplyState; @ApiModelProperty(value = "会员ID") private String memberUuid;