|
|
|
|
@@ -97,6 +97,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
|
|
|
|
|
EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoDTO.getPassUserId());
|
|
|
|
|
if (userInfo!=null){
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setPassUserName(userInfo.getName());
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setPassUserMobile(userInfo.getMobile());
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.isNotEmpty(partnerLineInfoAndBaseInfoVO.getPartnerUserPhone())){
|
|
|
|
|
DescribePhoneNumberDTO phoneNumberAttribute = aliyunService.getPhoneNumberAttribute(partnerLineInfoAndBaseInfoVO.getPartnerUserPhone());
|
|
|
|
|
@@ -263,6 +264,9 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
|
|
|
|
|
hy.setPassReason(closeFollowRequest.getPassReason());
|
|
|
|
|
hy.setPassTime(new Date());
|
|
|
|
|
hy.setPassUserId(userId);
|
|
|
|
|
if (CollectionUtils.isNotEmpty(closeFollowRequest.getCertifyFile())){
|
|
|
|
|
hy.setCertifyFile(JSONObject.toJSONString(closeFollowRequest.getCertifyFile()));
|
|
|
|
|
}
|
|
|
|
|
hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(hy);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -617,8 +621,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setAcceptAdjustType(partnerLineInfoAndBaseInfoDTO.getAcceptAdjustType());
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setWantShopArea(partnerLineInfoAndBaseInfoDTO.getWantShopArea());
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setLiveArea(partnerLineInfoAndBaseInfoDTO.getLiveArea());
|
|
|
|
|
if (StringUtil.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getPassCertifyFile())){
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setPassCertifyFile(JSONObject.parseArray(partnerLineInfoAndBaseInfoDTO.getPassCertifyFile(), String.class));
|
|
|
|
|
if (StringUtil.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getCertifyFile())){
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setPassCertifyFile(JSONObject.parseArray(partnerLineInfoAndBaseInfoDTO.getCertifyFile(), String.class));
|
|
|
|
|
}
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setPassUserId(partnerLineInfoAndBaseInfoDTO.getPassUserId());
|
|
|
|
|
partnerLineInfoAndBaseInfoVO.setPassTime(DateUtil.format(partnerLineInfoAndBaseInfoDTO.getPassTime(),CoolDateUtils.DATE_FORMAT_SEC));
|
|
|
|
|
|