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

冷静期结

Browse Source
This commit is contained in:
苏竹红
2023-07-25 17:38:06 +08:00
parent f70fff7c3b
commit f51d844ba1
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,7 +133,7 @@ public interface HyPartnerLineInfoService {
* @param lineId * @param lineId
* @return * @return
*/ */
Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType); Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean flag );
/** /**
* 线索状态 * 线索状态
@@ -159,7 +159,7 @@ public interface HyPartnerLineInfoService {
* @param acceptAdjustType * @param acceptAdjustType
* @return * @return
*/ */
HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType); HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean assignFlag);
Long checkGenerateNewLineId(Long lineId); Long checkGenerateNewLineId(Long lineId);

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

@@ -125,7 +125,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
hyPartnerBaseInfoDAO.updateByPartnerId(baseUserInfoRequest.getUsername(),baseUserInfoRequest.getMobile(),baseUserInfoRequest.getPartnerId()); hyPartnerBaseInfoDAO.updateByPartnerId(baseUserInfoRequest.getUsername(),baseUserInfoRequest.getMobile(),baseUserInfoRequest.getPartnerId());
// 更新线索状态 // 更新线索状态
HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), baseUserInfoRequest.getWantShopArea(), baseUserInfoRequest.getAcceptAdjustType()); HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), baseUserInfoRequest.getWantShopArea(), baseUserInfoRequest.getAcceptAdjustType(),Boolean.TRUE);
//更新意向申请表中信息 //更新意向申请表中信息
HyPartnerIntentInfoDO hyPartnerIntentInfoDO = hyPartnerIntentInfoDAO.selectByLineId(hyPartnerLineInfoDO.getId()); HyPartnerIntentInfoDO hyPartnerIntentInfoDO = hyPartnerIntentInfoDAO.selectByLineId(hyPartnerLineInfoDO.getId());
@@ -221,7 +221,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
// 更新线索状态和招商经理 // 更新线索状态和招商经理
//是公海线索 才会修改线索状态与招商经理 //是公海线索 才会修改线索状态与招商经理
if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){ if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){
Boolean flag = hyPartnerLineInfoService.assignFollowUser(request.getPartnerId(), request.getWantShopArea(), request.getAcceptAdjustType()); Boolean flag = hyPartnerLineInfoService.assignFollowUser(request.getPartnerId(), request.getWantShopArea(), request.getAcceptAdjustType(),Boolean.TRUE);
hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode()); hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode());
if (flag){ if (flag){
String investmentManager = hyPartnerLineInfoService.getAssignFollowUser(request.getPartnerId(), "intent"); String investmentManager = hyPartnerLineInfoService.getAssignFollowUser(request.getPartnerId(), "intent");

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

@@ -568,9 +568,12 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
} }
@Override @Override
public Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType) { public Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean flag) {
log.info("assignFollowUser partnerId:{}，wantShopArea：{}，acceptAdjustType：{}",partnerId,wantShopArea,acceptAdjustType); log.info("assignFollowUser partnerId:{}，wantShopArea：{}，acceptAdjustType：{}",partnerId,wantShopArea,acceptAdjustType);
if (!flag){
return Boolean.FALSE;
}
List<HyPartnerLineInfoDO> lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(partnerId); List<HyPartnerLineInfoDO> lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(partnerId);
//如果跟进次数大于1 直接使用上一次的招商经理 //如果跟进次数大于1 直接使用上一次的招商经理
if (CollectionUtils.isNotEmpty(lineFollowHistoryList)){ if (CollectionUtils.isNotEmpty(lineFollowHistoryList)){
@@ -710,10 +713,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
return null; return null;
} }
@Override @Override
public HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType) { public HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean assignFlag) {
// 生成一条线索 // 生成一条线索
HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(partnerId); HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(partnerId);
Boolean flag = this.assignFollowUser(partnerId, wantShopArea, acceptAdjustType); Boolean flag = this.assignFollowUser(partnerId, wantShopArea, acceptAdjustType,assignFlag);
String investmentManager = null; String investmentManager = null;
if (flag){ if (flag){
investmentManager = getAssignFollowUser(partnerId, "intent"); investmentManager = getAssignFollowUser(partnerId, "intent");
@@ -752,8 +755,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
//将老的线索置为删除状态 //将老的线索置为删除状态
hyPartnerLineInfoDAO.batchDeleted(Collections.singletonList(hyPartnerLineInfoDO.getId())); hyPartnerLineInfoDAO.batchDeleted(Collections.singletonList(hyPartnerLineInfoDO.getId()));
HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId()); HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId());
// 生成一条新线索 // 生成一条新线索 生成新线索的时候不需要公海到私海
HyPartnerLineInfoDO newLineInfoDO = this.generateDefaultLineInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerUserInfoDO.getWantShopArea(), hyPartnerUserInfoDO.getAcceptAdjustType()); HyPartnerLineInfoDO newLineInfoDO = this.generateDefaultLineInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerUserInfoDO.getWantShopArea(), hyPartnerUserInfoDO.getAcceptAdjustType(),Boolean.FALSE);
// 生成一条意向基本信息 // 生成一条意向基本信息
HyPartnerBaseInfoDO oldBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(hyPartnerUserInfoDO.getPartnerId(), lineId); HyPartnerBaseInfoDO oldBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(hyPartnerUserInfoDO.getPartnerId(), lineId);
hyPartnerBaseInfoService.generateBaseInfo(hyPartnerUserInfoDO, newLineInfoDO.getId(), oldBaseInfoDO.getUserPortrait()); hyPartnerBaseInfoService.generateBaseInfo(hyPartnerUserInfoDO, newLineInfoDO.getId(), oldBaseInfoDO.getUserPortrait());

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java
View File

@@ -108,7 +108,7 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
fillUserInfoDOByRequest(hyPartnerUserInfoDO, partnerUserInfoRequest); fillUserInfoDOByRequest(hyPartnerUserInfoDO, partnerUserInfoRequest);
hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO);
// 生成一条线索 // 生成一条线索
HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), partnerUserInfoRequest.getWantShopArea(), partnerUserInfoRequest.getAcceptAdjustType()); HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), partnerUserInfoRequest.getWantShopArea(), partnerUserInfoRequest.getAcceptAdjustType(),Boolean.TRUE);
// 生成一条意向基本信息 // 生成一条意向基本信息
hyPartnerBaseInfoService.generateBaseInfo(hyPartnerUserInfoDO, hyPartnerLineInfoDO.getId(), null); hyPartnerBaseInfoService.generateBaseInfo(hyPartnerUserInfoDO, hyPartnerLineInfoDO.getId(), null);
HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(partnerUserInfoRequest.getWantShopArea())); HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(partnerUserInfoRequest.getWantShopArea()));

2
coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
View File

@@ -294,7 +294,7 @@ public class DeskController {
public ResponseResult<Boolean> getFollowHistory(@RequestParam(value = "partnerId",required = false)String partnerId, public ResponseResult<Boolean> getFollowHistory(@RequestParam(value = "partnerId",required = false)String partnerId,
@RequestParam(value = "wantShopArea",required = false)String wantShopArea, @RequestParam(value = "wantShopArea",required = false)String wantShopArea,
@RequestParam(value = "acceptAdjustType",required = false)Integer acceptAdjustType){ @RequestParam(value = "acceptAdjustType",required = false)Integer acceptAdjustType){
return ResponseResult.success(hyPartnerLineInfoService.assignFollowUser(partnerId,wantShopArea,acceptAdjustType)); return ResponseResult.success(hyPartnerLineInfoService.assignFollowUser(partnerId,wantShopArea,acceptAdjustType,Boolean.TRUE));
} }