Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml

@@ -292,7 +292,9 @@
     SELECT t1.id interviewId, t1.id interview_id, t2.id as interviewPlanId, `status`, start_time, end_time, room_id, t1.partner_id partnerId, t1.interviewer interviewerId
       FROM hy_partner_interview t1
       LEFT JOIN hy_partner_interview_plan t2 ON t1.interview_plan_id = t2.id
-      WHERE t1.partner_id = #{partnerId} and deleted = 0
+      WHERE t1.partner_id = #{partnerId}
+      AND t1.deleted = 0
+      AND t2.deleted = 0
   </select>
   <select id="queryPartnerName" resultType="string">
     SELECT username

coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml

@@ -335,6 +335,7 @@
     left join hy_partner_user_info hpui on hpui.partner_id = hpip.partner_id
     left join enterprise_user eu on hpip.interviewer = eu.user_id
     <where>
+      hpip.deleted = 0
       <if test="record.partnerName !=null and record.partnerName!=''">
         hpui.username like concat('%',#{record.partnerName},'%')
       </if>

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

@@ -1,6 +1,7 @@
 package com.cool.store.service;
 
 import com.cool.store.entity.HyPartnerLineInfoDO;
+import com.cool.store.exception.ApiException;
 import com.cool.store.request.CloseFollowRequest;
 import com.cool.store.request.LineRequest;
 import com.cool.store.request.PrivateSeaLineListRequest;
@@ -147,7 +148,7 @@ public interface HyPartnerLineInfoService {
      */
      String getAssignFollowUser(String partnerId,String type);
 
-    InterviewVO getInterviewInfo(Long lineId);
+    InterviewVO getInterviewInfo(Long lineId) throws ApiException;
 
     /**
      * 生成一条默认线索

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

@@ -22,7 +22,7 @@ public interface InterviewService {
      * @param request
      * @return
      */
-    InterviewVO getInterviewInfo(QueryByInterviewPlanIdReq request);
+    InterviewVO getInterviewInfo(QueryByInterviewPlanIdReq request) throws ApiException;
 
     /**
      * 委托他人

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

@@ -27,7 +27,7 @@ public interface PartnerInterviewService {
     /**
      * 获取通知函详情
      */
-    PartnerPassLetterDetailVO passLetterDetail(String interviewPlanId);
+    PartnerPassLetterDetailVO passLetterDetail(String interviewPlanId) throws ApiException;
 
     /**
      * 修改面试时间

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

@@ -10,6 +10,7 @@ import com.cool.store.dto.buser.UserPositionAndUserScopeDTO;
 import com.cool.store.dto.partner.*;
 import com.cool.store.entity.*;
 import com.cool.store.enums.*;
+import com.cool.store.exception.ApiException;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.request.CloseFollowRequest;
 import com.cool.store.request.LineRequest;
@@ -516,7 +517,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
     }
 
     @Override
-    public InterviewVO getInterviewInfo(Long lineId) {
+    public InterviewVO getInterviewInfo(Long lineId) throws ApiException {
         Long interviewId = hyPartnerInterviewPlanDAO.selectInterviewIdByLineId(lineId);
         QueryByInterviewPlanIdReq queryByInterviewPlanIdReq = new QueryByInterviewPlanIdReq();
         if (interviewId!=null){

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

@@ -93,9 +93,13 @@ public class InterviewServiceImpl implements InterviewService {
     }
 
     @Override
-    public InterviewVO getInterviewInfo(QueryByInterviewPlanIdReq request) {
+    public InterviewVO getInterviewInfo(QueryByInterviewPlanIdReq request) throws ApiException {
         String interviewPlanId = request.getInterviewPlanId();
         InterviewVO vo = hyPartnerInterviewPlanMapper.getInterviewInfo(interviewPlanId);
+        //如果面试信息为空，抛出异常
+        if (vo == null) {
+            throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_NOT_EXIST);
+        }
         //将 processInfo 解析为 List
         if (!StringUtils.isEmpty(vo.getProcessInfo())) {
             List<String> split = Arrays.asList(vo.getProcessInfo().split(","));

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

@@ -71,9 +71,7 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService {
             hyPartnerInterviewDO.setInterviewPlanId(Long.parseLong(dto.getInterviewPlanId()));
             //1. 将面试状态改为 --> 2已开始
             hyPartnerInterviewDO.setStatus(2);
-            //3. 修改面试实际开始时间，以第一个人进来的时间为准，后续不再修改
+            //2. 修改加盟商或面试官进入面试时间
-            hyPartnerInterviewDO.setInterviewerEnterTime(DateUtil.date());
-            //4. 修改加盟商或面试官进入面试时间
             //加盟商
             if (dto.getUserType().equals(2)) {
                 hyPartnerInterviewDO.setPartnerEnterTime(DateUtil.date());
@@ -84,15 +82,17 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService {
             interviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO);
             HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO();
             hyPartnerInterviewPlanDO.setId(Long.parseLong(dto.getInterviewPlanId()));
-            //5. 加盟商如果进入了，就修改面试计划表 is_partner_interview 字段
+            //3. TODO（待确认） 修改面试实际开始时间，以第一个人进来的时间为准，后续不再修改
+            hyPartnerInterviewPlanDO.setActualEndTime(DateUtil.date());
+            //4. 加盟商如果进入了，就修改面试计划表 is_partner_interview 字段
             if (dto.getUserType().equals(2)) {
                 hyPartnerInterviewPlanDO.setIsPartnerInterview(1);
             }
-            //6. 修改房间状态为已开放
+            //5. 修改房间状态为已开放
             interviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO);
-            //7. 查询对应的面试官id、姓名及加盟商姓名
+            //6. 查询对应的面试官id、姓名及加盟商姓名
             EnterInterviewVO vo = interviewMapper.getInterviewerByInterviewPlanId(dto.getInterviewPlanId());
-            //8. 生成 userSign
+            //7. 生成 userSign
             String userSig = TRTCUtils.genUserSig(sdkAppId, key, dto.getUserId());
             vo.setUserSign(userSig);
             return vo;
@@ -105,8 +105,12 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService {
      * 获取通知函详情
      */
     @Override
-    public PartnerPassLetterDetailVO passLetterDetail(String interviewPlanId) {
+    public PartnerPassLetterDetailVO passLetterDetail(String interviewPlanId) throws ApiException {
         PartnerPassLetterDetailVO vo = interviewMapper.getPassLetterDetail(interviewPlanId);
+        //如果面试信息为空，抛出异常
+        if (vo == null) {
+            throw new ApiException(ErrorCodeEnum.INTERVIEW_PLAN_NOT_EXIST);
+        }
         //解析意向开店区域为市级行政区
         String verifyCity = vo.getVerifyCity();
         String[] split = verifyCity.split("/");

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

@@ -291,7 +291,7 @@ public class DeskController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
     })
-    public ResponseResult<InterviewVO> getInterviewInfoByLineId(@RequestParam(value = "lineId",required = false)Long lineId){
+    public ResponseResult<InterviewVO> getInterviewInfoByLineId(@RequestParam(value = "lineId",required = false)Long lineId) throws ApiException {
         return ResponseResult.success(hyPartnerLineInfoService.getInterviewInfo(lineId));
     }
 }

coolstore-partner-webb/src/main/java/com/cool/store/controller/InterviewController.java

@@ -42,7 +42,7 @@ public class InterviewController {
 
     @PostMapping("/queryByInterviewPlanId")
     @ApiOperation("根据面试会议计划id查询面试信息")
-    public ResponseResult<InterviewVO> queryByInterviewPlanId(@RequestBody QueryByInterviewPlanIdReq request) {
+    public ResponseResult<InterviewVO> queryByInterviewPlanId(@RequestBody QueryByInterviewPlanIdReq request) throws ApiException {
         InterviewVO interviewVO = interviewService.getInterviewInfo(request);
         return ResponseResult.success(interviewVO);
     }

coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java

@@ -44,7 +44,7 @@ public class InterviewController {
 
     @PostMapping("/passLetter/detail")
     @ApiOperation("通过函详情")
-    public ResponseResult<PartnerPassLetterDetailVO> passLetterDetail(@RequestBody PartnerGetPassLetterDetailDto dto) {
+    public ResponseResult<PartnerPassLetterDetailVO> passLetterDetail(@RequestBody PartnerGetPassLetterDetailDto dto) throws ApiException {
         return ResponseResult.success(interviewService.passLetterDetail(dto.getInterviewPlanId()));
     }