Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230904' into dev/feat/partner1.3_20230904

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

@@ -84,7 +84,7 @@ public enum ErrorCodeEnum {
     INTERVIEW_LINE_ID_IS_NULL(1021113, "线索id为空！", null),
     INTERVIEW_INTERVIEW_TIME_IS_UNUSABLE(1021114, "当前预约时间不可用，请和线索用户协商其他时间后确定预约时间\n面试人：{0} 手机号：{1}", null),
     INTERVIEW_PARTNER_NOT_EXIST(1021115, "线索下的加盟商不存在！", null),
-    INTERVIEW_STATUS_NOT_TRANSFER(1021116, "当前面试状态不允许转让！ 面试状态:{}", null),
+    INTERVIEW_STATUS_NOT_TRANSFER(1021116, "当前面试状态不允许转让！ 面试状态:{0}", null),
 
     ROOM_STATUS_ERROR(10211156, "当前面试房间状态不允许进行该操作！", null),
     MOBILE_APP_NOT_ONLINE_ERROR(10211157, "呼叫失败，请确认呼出号码正确并检查是否安装并打开呼叫插件", null),

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

@@ -15,7 +15,7 @@ public enum FeiShuNoticeMsgEnum {
     BATCH_TRANS_INVESTMENT_MANAGER("收到新线索", "有{0}条新线索于 {1} 转让给您，请及时跟进", "img_v2_33296002-829e-490e-bd11-0d9ae763a67g"),
     INTENTION_APPLY("加盟意向申请", "您有一个【加盟意向申请】待审核，申请人 {0} 手机号 {1} 于 {2} 提交加盟意向申请，请及时处理", "img_v2_c909097d-67d1-4c11-a911-a2584b67ca6g"),
     FOLLOW_TASK("线索跟进任务", "{0}", "img_v2_1960b7ef-8c4e-4c3d-8b67-3d918a85578g"),
-    INTERVIEW_APPOINTMENT("面试预约申请", "{0}","img_v2_107bb06b-2a7a-43e1-a6ae-e5d2f2dae17g"),
+    INTERVIEW_APPOINTMENT("面试预约申请", "您有一个【面试预约申请】待处理，预约人 {0}  手机号 {1} ，预约面试时间 {3} ","img_v2_107bb06b-2a7a-43e1-a6ae-e5d2f2dae17g"),
     ;
 
     private String title;

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

@@ -197,15 +197,15 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         }
         //转让招商经理
         hyPartnerLineInfoDAO.updateInvestmentManager(request.getUserId(), Arrays.asList(request.getLineId()));
+        String dateTime = DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_7);
+        HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId());
         //发送飞书工作通知
         if (sendFlag){
-            String dateTime = DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_7);
-            HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId());
             noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.TRANS_INVESTMENT_MANAGER,Arrays.asList(request.getUserId()),dateTime,hyPartnerUserInfoDO.getUsername(),hyPartnerUserInfoDO.getMobile());
-            //如果是面试预约待审批阶段还要发送面试预约申请通知
+        }
-            if (WorkflowStageEnum.RESERVATION.getCode().equals(hyPartnerLineInfoDO.getWorkflowStage()) && WorkflowStatusEnum.RESERVATION_1.getCode().equals(hyPartnerLineInfoDO.getWorkflowStatus())) {
+        //如果是面试预约待审批阶段还要发送面试预约申请通知
-                noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT, Arrays.asList(request.getUserId()),dateTime,hyPartnerUserInfoDO.getUsername(),hyPartnerUserInfoDO.getMobile());
+        if (WorkflowStageEnum.RESERVATION.getCode().equals(hyPartnerLineInfoDO.getWorkflowStage()) && WorkflowStatusEnum.RESERVATION_1.getCode().equals(hyPartnerLineInfoDO.getWorkflowStatus())) {
-            }
+            noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.INTERVIEW_APPOINTMENT, Arrays.asList(request.getUserId()),hyPartnerUserInfoDO.getUsername(),hyPartnerUserInfoDO.getMobile(),dateTime);
         }
 
         //作废待完成&已逾期的任务
@@ -248,10 +248,13 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
                 this.transferInvestmentManager(user,transferInvestmentManagerRequest,Boolean.FALSE);
                 successLineIds.add(lineId);
             } catch (Exception e) {
-                log.info("transferInvestmentManager_success Transfer_interview_management_failed,lineId:{}",lineId);
+                log.info("transferInvestmentManager_success Transfer_interview_management_failed,lineId:{}，e:{}",lineId,e.getMessage());
                 HyPartnerUserInfoDO hyPartnerUserInfoDO = partnerUserInfoDOMap.get(partnerMap.get(lineId));
                 BatchTransferVO batchTransferVO = new BatchTransferVO();
                 batchTransferVO.setErrorMessage(e.getMessage());
+                if (e instanceof ServiceException){
+                    batchTransferVO.setErrorMessage(((ServiceException)e).getErrorMessage());
+                }
                 batchTransferVO.setPartnerMobile(hyPartnerUserInfoDO.getMobile());
                 batchTransferVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername());
                 result.add(batchTransferVO);
@@ -276,6 +279,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         if (StringUtils.isEmpty(userId)|| CollectionUtils.isEmpty(lineIdList)){
             throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
         }
+        EnterpriseUserDO user = enterpriseUserDAO.getUserInfoById(userId);
+        if (user==null){
+            throw new ServiceException(ErrorCodeEnum.INVESTMENT_MANAGER_NOT_EXIST);
+        }
         //加盟上线索集合
         List<HyPartnerLineInfoDO> partnerLineInfoList= hyPartnerLineInfoDAO.getLineListByLineIds(lineIdList);
         //过滤出已结束的线索 这块线索需要重新生成新的线索