suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
苏竹红
2023-06-25 20:14:55 +08:00
parent db7973a80a 6ba879d09c
commit 7e6ddefab1
12 changed files with 56 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
View File

@@ -160,20 +160,22 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
return intentInfoVO;
}
HyPartnerIntentInfoDO intentInfoDO = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(userInfoVO.getPartnerId(), lineId);
PartnerIntentInfoVO intentInfoVO = null;
if (intentInfoDO != null){
PartnerIntentInfoVO intentInfoVO = convertPartnerIntentApplyInfoDOToVO(intentInfoDO);
if(StringUtils.isBlank(intentInfoVO.getLiveArea())){
intentInfoVO.setLiveArea(userInfoVO.getLiveArea());
}
if(StringUtils.isBlank(intentInfoVO.getWantShopArea())){
intentInfoVO.setWantShopArea(userInfoVO.getWantShopArea());
}
if(Objects.isNull(intentInfoVO.getAcceptAdjustType())){
intentInfoVO.setAcceptAdjustType(userInfoVO.getAcceptAdjustType());
}
return intentInfoVO;
intentInfoVO = convertPartnerIntentApplyInfoDOToVO(intentInfoDO);
}else {
intentInfoVO = new PartnerIntentInfoVO();
}
return null;
if(StringUtils.isBlank(intentInfoVO.getLiveArea())){
intentInfoVO.setLiveArea(userInfoVO.getLiveArea());
}
if(StringUtils.isBlank(intentInfoVO.getWantShopArea())){
intentInfoVO.setWantShopArea(userInfoVO.getWantShopArea());
}
if(Objects.isNull(intentInfoVO.getAcceptAdjustType())){
intentInfoVO.setAcceptAdjustType(userInfoVO.getAcceptAdjustType());
}
return intentInfoVO;
}
private void fillIntentInfo(HyPartnerIntentInfoDO intentInfoDO, PartnerIntentInfoRequest request) {

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -434,8 +434,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
if (hyIntendDevelopementMappingDO==null){
return Boolean.FALSE;
}
//如果是私海线索 不需要重新分配招商经理 或者跟进次数大于1
if (HyPartnerLineInfo.getLineStatus()==1||CollectionUtils.isEmpty(lineFollowHistoryList)){
//如果是私海线索 不需要重新分配招商经理 或者跟进次数大于等于1
if ((HyPartnerLineInfo != null && HyPartnerLineInfo.getLineStatus()==1) || CollectionUtils.isNotEmpty(lineFollowHistoryList)){
return Boolean.FALSE;
}
if(HyPartnerLineInfo == null){