|
|
|
|
@@ -98,20 +98,28 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
|
|
|
|
|
throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
|
|
|
|
|
}
|
|
|
|
|
PartnerLineInfoAndBaseInfoVO partnerLineInfoAndBaseInfoVO = convertPartnerLineInfoAndBaseInfoDTOToVo(partnerLineInfoAndBaseInfoDTO);
|
|
|
|
|
EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoDTO.getPassUserId());
|
|
|
|
|
if (userInfo!=null){
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setPassUserName(userInfo.getName());
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setPassUserMobile(userInfo.getMobile());
|
|
|
|
|
List<String> userIds = new ArrayList<>();
|
|
|
|
|
if (StringUtils.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getPassUserId())){
|
|
|
|
|
userIds.add(partnerLineInfoAndBaseInfoDTO.getPassUserId());
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(partnerLineInfoAndBaseInfoVO.getInvestmentManager())){
|
|
|
|
|
userIds.add(partnerLineInfoAndBaseInfoVO.getInvestmentManager());
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(partnerLineInfoAndBaseInfoVO.getDevelopmentDirector())){
|
|
|
|
|
userIds.add(partnerLineInfoAndBaseInfoVO.getDevelopmentDirector());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<EnterpriseUserDO> userList = enterpriseUserDAO.getUserInfoByUserIds(userIds);
|
|
|
|
|
Map<String, EnterpriseUserDO> userDOMap = userList.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, data -> data));
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setPassUserName(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getPassUserId(),new EnterpriseUserDO()).getName());
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setPassUserMobile(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getPassUserId(),new EnterpriseUserDO()).getMobile());
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setInvestmentManagerName(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getInvestmentManager(),new EnterpriseUserDO()).getName());
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setInvestmentManagerPhone(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getInvestmentManager(),new EnterpriseUserDO()).getMobile());
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setDevelopmentDirectorName(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getDevelopmentDirector(),new EnterpriseUserDO()).getName());
|
|
|
|
|
if (StringUtils.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getWantShopArea())){
|
|
|
|
|
HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(partnerLineInfoAndBaseInfoDTO.getWantShopArea()));
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/"," "));
|
|
|
|
|
}
|
|
|
|
|
EnterpriseUserDO investmentManager = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoVO.getInvestmentManager());
|
|
|
|
|
if (investmentManager!=null){
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setInvestmentManagerName(investmentManager.getName());
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setInvestmentManagerPhone(investmentManager.getMobile());
|
|
|
|
|
}
|
|
|
|
|
return partnerLineInfoAndBaseInfoVO;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -756,6 +764,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setLiveArea(partnerLineInfoAndBaseInfoDTO.getLiveArea());
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setIdCard(partnerLineInfoAndBaseInfoDTO.getIdCard());
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setChannelName(partnerLineInfoAndBaseInfoDTO.getChannelName());
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setDevelopmentDirector(partnerLineInfoAndBaseInfoDTO.getDevelopmentDirector());
|
|
|
|
|
if (StringUtil.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getCertifyFile())){
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setPassCertifyFile(JSONObject.parseArray(partnerLineInfoAndBaseInfoDTO.getCertifyFile(), String.class));
|
|
|
|
|
}
|
|
|
|
|
|