From f7bbd7499076da39cf344efb1f5b9f3a62705d94 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 10 Apr 2025 10:57:09 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/vo/PartnerBaseInfoVO.java | 5 +++++ .../service/impl/JoinIntentionServiceImpl.java | 15 ++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java index 79444ee49..82eb35d24 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java @@ -104,7 +104,12 @@ public class PartnerBaseInfoVO { private String unifiedSocialCreditCode; + @ApiModelProperty("督导name") + private String supervisorName; + private String supervisorId; + @ApiModelProperty("督导手机号") + private String supervisorMobile; public static PartnerBaseInfoVO from(QualificationsInfoDO qualificationsInfoDO, LineInfoDO lineInfoDO) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index 0f9dcf527..f90b026d3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -2,10 +2,7 @@ package com.cool.store.service.impl; import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; -import com.cool.store.dao.HyPartnerUserInfoDAO; -import com.cool.store.dao.LineInfoDAO; -import com.cool.store.dao.QualificationsInfoDAO; -import com.cool.store.dao.RegionAreaConfigDao; +import com.cool.store.dao.*; import com.cool.store.entity.*; import com.cool.store.enums.*; import com.cool.store.exception.ServiceException; @@ -35,6 +32,8 @@ import java.util.*; @Slf4j public class JoinIntentionServiceImpl extends LineFlowService implements JoinIntentionService { + @Resource + private EnterpriseUserDAO enterpriseUserDAO; @Resource JoinIntentionMapper joinIntentionMapper; @@ -119,7 +118,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt //更新加盟问卷信息 qualificationsInfoDAO.updateAuditIdByLineId(auditId, lineInfo.getId()); QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfo.getId()); - if (StringUtils.isBlank(qualificationsInfoDO.getIdCardNo())||qualificationsInfoDO.getIdCardNo().length()<6){ + if (StringUtils.isBlank(qualificationsInfoDO.getIdCardNo()) || qualificationsInfoDO.getIdCardNo().length() < 6) { throw new ServiceException(ErrorCodeEnum.CREATE_PASSWORD_FAIL); } String substring = qualificationsInfoDO.getIdCardNo().substring(qualificationsInfoDO.getIdCardNo().length() - 6); @@ -167,6 +166,12 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt response.setRejectPublicReason(lineAuditInfoDO.getRejectPublicReason()); } response.setBigRegionId(byLineId.getBigRegionId()); + response.setSupervisorId(byLineId.getInvestmentManager()); + EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoById(byLineId.getInvestmentManager()); + if (Objects.nonNull(enterpriseUserDO)) { + response.setSupervisorName(enterpriseUserDO.getName()); + response.setSupervisorMobile(enterpriseUserDO.getMobile()); + } return response; } }