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

joinStatus

Browse Source
This commit is contained in:
苏竹红
2024-04-10 11:30:27 +08:00
parent 45f8b522cd
commit 44a7615b3e
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-common/src/main/java/com/cool/store/enums/OperationLogTypeEnum.java
View File

@@ -7,8 +7,9 @@ package com.cool.store.enums;
*/ */
public enum OperationLogTypeEnum { public enum OperationLogTypeEnum {
TRANSFER_INVESTMENT_MANAGER(1, "转让招商经理"), TRANSFER_INVESTMENT_MANAGER(1, "转让招商经理_线索"),
ENTRUST_INTERVIEW(2, "委托面试"); ENTRUST_INTERVIEW(2, "委托面试"),
TRANSFER_INVESTMENT_MANAGER_3(3, "转让招商经理_加盟商");
private final int code; private final int code;
private final String description; private final String description;

12
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
View File

@@ -233,7 +233,7 @@ public class LineServiceImpl implements LineService {
List<Long> lineIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getId() != null).map(LineInfoDO::getId).collect(Collectors.toList()); List<Long> lineIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getId() != null).map(LineInfoDO::getId).collect(Collectors.toList());
List<SigningBaseInfoDO> signingBaseInfoDOS = intentAgreementMapper.selectByLineIds(lineIds); List<SigningBaseInfoDO> signingBaseInfoDOS = intentAgreementMapper.selectByLineIds(lineIds);
Map<Long, Date> dateMap = signingBaseInfoDOS.stream().collect(Collectors.toMap(SigningBaseInfoDO::getId, SigningBaseInfoDO::getCreateTime)); Map<Long, Date> dateMap = signingBaseInfoDOS.stream().collect(Collectors.toMap(SigningBaseInfoDO::getLineId, SigningBaseInfoDO::getCreateTime));
List<PartnerListVO> result = new ArrayList<>(); List<PartnerListVO> result = new ArrayList<>();
lineInfoDOS.forEach(x->{ lineInfoDOS.forEach(x->{
@@ -280,13 +280,21 @@ public class LineServiceImpl implements LineService {
if (lineInfo.getLineStatus().equals(LineStatusEnum.PUBLIC_SEAS.getCode())){ if (lineInfo.getLineStatus().equals(LineStatusEnum.PUBLIC_SEAS.getCode())){
throw new ServiceException(ErrorCodeEnum.NOT_IN_PUBLIC_SEA); throw new ServiceException(ErrorCodeEnum.NOT_IN_PUBLIC_SEA);
} }
if (lineInfo.getInvestmentManager().equals(changeInvestmentRequest.getInvestmentManagerId())){
throw new ServiceException(ErrorCodeEnum.NO_TRANSFER_REQUIRED);
}
//如果线索招商经理为空 直接分配 如果不为空 且线索在公海 说明线索被结束 需要重置ID 生成一条新的线索 //如果线索招商经理为空 直接分配 如果不为空 且线索在公海 说明线索被结束 需要重置ID 生成一条新的线索
lineInfo.setLineStatus(LineStatusEnum.PRIVATE_SEAS.getCode()); lineInfo.setLineStatus(LineStatusEnum.PRIVATE_SEAS.getCode());
lineInfo.setInvestmentManager(changeInvestmentRequest.getInvestmentManagerId()); lineInfo.setInvestmentManager(changeInvestmentRequest.getInvestmentManagerId());
lineInfoDAO.updateLineInfo(lineInfo); lineInfoDAO.updateLineInfo(lineInfo);
if (transferFlag){ if (transferFlag){
//添加日志 //添加日志
transferLogService.addLog(lineInfo,userInfo.getUserId(),changeInvestmentRequest.getInvestmentManagerId(), OperationLogTypeEnum.TRANSFER_INVESTMENT_MANAGER); OperationLogTypeEnum operationLogTypeEnum = OperationLogTypeEnum.TRANSFER_INVESTMENT_MANAGER;
if (lineInfo.getJoinStatus()!=0){
operationLogTypeEnum = OperationLogTypeEnum.TRANSFER_INVESTMENT_MANAGER_3;
}
transferLogService.addLog(lineInfo,userInfo.getUserId(),changeInvestmentRequest.getInvestmentManagerId(),operationLogTypeEnum);
} }
return Boolean.TRUE; return Boolean.TRUE;
} }