fix

coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

@@ -127,6 +127,7 @@ public enum ErrorCodeEnum {
     INTERVIEW_PARTNER_NOT_EXIST(1021115, "线索下的加盟商不存在！", null),
     INTERVIEW_STATUS_NOT_TRANSFER(1021116, "当前面审状态不允许转让！ 面审状态:{0}", null),
     MOBILE_WECHAT_EXIST(1021116, "此号码已绑定其他微信", null),
+    INTERVIEW_STATUS_WAS_AUDITED(1021117, "当前面审已审核", null),
 
     ROOM_STATUS_ERROR(10211156, "当前面审房间状态不允许进行该操作！", null),
     MOBILE_APP_NOT_ONLINE_ERROR(10211157, "呼叫失败，请确认呼出号码正确并检查是否安装并打开呼叫插件", null),

coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java

@@ -170,7 +170,7 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
         messageMap.put("lineId", String.valueOf(lineInfo.getId()));
         messageMap.put("partnerUsername", lineInfo.getUsername());
         messageMap.put("appointmentTime", DateUtils.parseDateToStr(DateUtils.NOTICE_DATE, startTime));
-        messageMap.put("interviewUsername", enterpriseUserDAO.getUserName(lineInfo.getInvestmentManager()));
+        messageMap.put("interviewUsername", enterpriseUserDAO.getUserName(interviewerUserId));
         commonService.sendMessage(Arrays.asList(interviewerUserId), messageEnum, messageMap);
         if(Objects.nonNull(investmentManagerMessageEnum)){
             commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), investmentManagerMessageEnum, messageMap);
@@ -413,7 +413,7 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
     }
 
     @Override
-    protected Boolean auditPass(Long auditId, LineInfoDO lineInfo,String userId) {
+    protected Boolean auditPass(Long auditId, LineInfoDO lineInfo, String userId) {
         InterviewTypeEnum interviewType = WorkflowSubStageEnum.getInterviewType(lineInfo.getWorkflowSubStage());
         WorkflowSubStageEnum workflowSubStageEnum = WorkflowSubStageEnum.getWorkflowSubStageEnum(lineInfo.getWorkflowSubStage());
         WorkflowSubStageEnum nextStage = workflowSubStageEnum.getNextStage();
@@ -421,6 +421,9 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
         if(Objects.isNull(interviewInfo)){
             throw new ServiceException(ErrorCodeEnum.INTERVIEW_NOT_EXIST);
         }
+        if(!InterviewStatusEnum.WAIT_AUDIT.getCode().equals(interviewInfo.getInterviewStatus())){
+            throw new ServiceException(ErrorCodeEnum.INTERVIEW_STATUS_WAS_AUDITED);
+        }
         LineInterviewDO updateInterviewInfo = new LineInterviewDO();
         updateInterviewInfo.setId(interviewInfo.getId());
         updateInterviewInfo.setAuditId(auditId);
@@ -428,7 +431,7 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
         if(WorkflowSubStageEnum.INVITING_INTERVIEWS.equals(workflowSubStageEnum)){
             //更新线索阶段
             lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus(),userId);
-            commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.INTERVIEW_APPOINTMENT_SUCCESS, null);
+            commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.FIRST_INTERVIEW_APPOINTMENT_SUCCESS, null);
         }
         if(WorkflowSubStageEnum.FIRST_INTERVIEWS.equals(workflowSubStageEnum)){
             //更新线索阶段
@@ -455,6 +458,13 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
             auditStatusService.insert(lineInfo.getId(),interviewInfo.getId(),auditId,AuditStageEnum.TWO.getCode());
             //发送短信
             commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.SECOND_INTERVIEW_SUCCESS, null);
+            String wantShopName = hyOpenAreaInfoDAO.selectNameMapById(lineInfo.getWantShopAreaId());
+            Map<String, String> messageMap = new HashMap<>();
+            messageMap.put("lineId", String.valueOf(lineInfo.getId()));
+            messageMap.put("partnerUsername", lineInfo.getUsername());
+            messageMap.put("partnerMobile", lineInfo.getMobile());
+            messageMap.put("wantShopName", wantShopName);
+            commonService.sendMessage(Arrays.asList(developmentManager), MessageEnum.MESSAGE_14, messageMap);
             Map<String, String> requestMap = new HashMap<>();
             //todo 建店还未开始时
             requestMap.put("storeName","XXX");