diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineCalendarsEventDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineCalendarsEventDO.java index 5e51b9235..223fb3efc 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineCalendarsEventDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineCalendarsEventDO.java @@ -1,5 +1,6 @@ package com.cool.store.entity; +import com.cool.store.enums.InterviewTypeEnum; import lombok.Data; import java.util.Date; @@ -82,4 +83,18 @@ public class LineCalendarsEventDO { @Column(name = "update_time") private Date updateTime; + public static LineCalendarsEventDO convertDO(LineInfoDO lineInfo, Integer interviewType, Date startTime, Date endTime, String interviewer){ + LineCalendarsEventDO calendarsEvent = new LineCalendarsEventDO(); + calendarsEvent.setRegionId(lineInfo.getRegionId()); + calendarsEvent.setLineId(lineInfo.getId()); + calendarsEvent.setPartnerId(lineInfo.getPartnerId()); + calendarsEvent.setEventTitle(lineInfo.getUsername() + " " + (InterviewTypeEnum.MEET.equals(interviewType) ? "面谈" :"面审")); + calendarsEvent.setInterviewType(interviewType); + calendarsEvent.setInterviewDate(startTime); + calendarsEvent.setStartTime(startTime); + calendarsEvent.setEndTime(endTime); + calendarsEvent.setInterviewer(interviewer); + return calendarsEvent; + } + } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInterviewDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInterviewDO.java index 928c6f145..80be7fd9d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInterviewDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInterviewDO.java @@ -1,5 +1,6 @@ package com.cool.store.entity; +import com.cool.store.utils.UUIDUtils; import lombok.Data; import java.util.Date; @@ -136,4 +137,19 @@ public class LineInterviewDO { @Column(name = "update_time") private Date updateTime; + public static LineInterviewDO convertDO(LineInfoDO lineInfo, Date startTime, Date endTime, String roomId, String interviewer, Integer interviewType, Long calendarsEventId){ + LineInterviewDO addInterview = new LineInterviewDO(); + addInterview.setLineId(lineInfo.getId()); + addInterview.setPartnerId(lineInfo.getPartnerId()); + addInterview.setRegionId(lineInfo.getRegionId()); + addInterview.setInterviewDate(startTime); + addInterview.setStartTime(startTime); + addInterview.setEndTime(endTime); + addInterview.setRoomId(roomId); + addInterview.setInterviewer(interviewer); + addInterview.setInterviewType(interviewType); + addInterview.setCalendarsEventId(calendarsEventId); + return addInterview; + } + } \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java index 8959e2a9b..4fdddbdbe 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java @@ -95,32 +95,13 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt } Date startTime = DateUtils.strToDate(request.getStartTime(), DateUtils.YYYY_MM_DD_HH_MM_SS); Date endTime = DateUtils.strToDate(request.getEndTime(), DateUtils.YYYY_MM_DD_HH_MM_SS); - LineCalendarsEventDO calendarsEvent = new LineCalendarsEventDO(); - calendarsEvent.setRegionId(lineInfo.getRegionId()); - calendarsEvent.setLineId(lineInfo.getId()); - calendarsEvent.setPartnerId(lineInfo.getPartnerId()); - calendarsEvent.setEventTitle(lineInfo.getUsername() + " " + (InterviewTypeEnum.MEET.equals(interviewType) ? "面谈" :"面审")); - calendarsEvent.setInterviewType(request.getInterviewType()); - calendarsEvent.setInterviewDate(startTime); - calendarsEvent.setStartTime(startTime); - calendarsEvent.setEndTime(endTime); - calendarsEvent.setInterviewer(interviewer); + LineCalendarsEventDO calendarsEvent = LineCalendarsEventDO.convertDO(lineInfo, request.getInterviewType(), startTime, endTime, interviewer); Long eventId = lineCalendarsEventDAO.addCalendarsEvent(calendarsEvent); //跟新线索状态为已预约 lineInfoDAO.updateLineInfo(lineInfo); LineInterviewDO interviewInfo = lineInterviewDAO.getInterviewInfo(lineInfo.getId(), interviewType); if(Objects.isNull(interviewInfo)){ - LineInterviewDO addInterview = new LineInterviewDO(); - addInterview.setLineId(lineInfo.getId()); - addInterview.setPartnerId(lineInfo.getPartnerId()); - addInterview.setRegionId(lineInfo.getRegionId()); - addInterview.setInterviewDate(startTime); - addInterview.setStartTime(startTime); - addInterview.setEndTime(endTime); - addInterview.setRoomId(UUIDUtils.get8UUID()); - addInterview.setInterviewer(interviewer); - addInterview.setInterviewType(interviewType.getCode()); - addInterview.setCalendarsEventId(eventId); + LineInterviewDO addInterview = LineInterviewDO.convertDO(lineInfo, startTime, endTime, UUIDUtils.get8UUID(), interviewer, interviewType.getCode(), eventId); lineInterviewDAO.addInterviewInfo(addInterview); return Boolean.FALSE; }