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

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java

@@ -87,4 +87,10 @@ public interface HyPartnerInterviewMapper {
      */
     String getLineId(@Param("interviewPlanId") String interviewPlanId);
 
+    /**
+     * 获取面试流程状态
+     * @param interviewPlanId
+     * @return
+     */
+    String getStatus(String interviewPlanId);
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java

@@ -141,5 +141,16 @@ public interface HyPartnerInterviewPlanMapper {
      */
     Integer getRoomStatus(@Param("interviewPlanId") String interviewPlanId);
 
+    /**
+     * 获取面试开始时间
+     */
+    String getInterviewStartTime(String interviewPlanId);
+
+    /**
+     * 根据面试计划id获取面试计划信息
+     * @param interviewPlanId
+     * @return
+     */
+    HyPartnerInterviewPlanDO getInterviewPlanById(String interviewPlanId);
 
 }

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

@@ -471,4 +471,11 @@
     and deleted = 0
   </select>
 
+  <!-- 获取面试流程状态 -->
+  <select id="getStatus" resultType="java.lang.String">
+    SELECT status
+      FROM hy_partner_interview
+      WHERE interview_plan_id = #{interviewPlanId}
+  </select>
+
 </mapper>

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

@@ -468,4 +468,18 @@
       from hy_partner_interview_plan
       where id = #{interviewPlanId}
   </select>
+
+  <!-- 获取面试开始时间 -->
+  <select id="getInterviewStartTime" resultType="java.lang.String">
+    select start_time
+      from hy_partner_interview_plan
+      where id = #{interviewPlanId}
+  </select>
+
+  <!-- 根据id获取面试计划信息 -->
+  <select id="getInterviewPlanById" resultType="com.cool.store.entity.HyPartnerInterviewPlanDO">
+    select <include refid="Base_Column_List"></include>
+      from hy_partner_interview_plan
+      where id = #{interviewPlanId}
+  </select>
 </mapper>

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

@@ -47,7 +47,7 @@ public interface InterviewService {
      * 最后返回 userSign 用于进入腾讯云音视频房间
      * @return userSign 进入视频所需签名
      */
-    EnterInterviewVO enterInterviewRoom(EnterInterviewDto dto);
+    EnterInterviewVO enterInterviewRoom(EnterInterviewDto dto) throws ApiException;
 
     /**
      * 创建面试预约信息

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

@@ -22,7 +22,7 @@ public interface PartnerInterviewService {
      * 最后返回 userSign 用于进入腾讯云音视频房间
      * @return userSign 进入视频所需签名
      */
-    EnterInterviewVO enterInterviewRoom(EnterInterviewDto dto);
+    EnterInterviewVO enterInterviewRoom(EnterInterviewDto dto) throws ApiException;
 
     /**
      * 获取通知函详情

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

@@ -23,6 +23,7 @@ import com.cool.store.service.HyPartnerLineInfoService;
 import com.cool.store.utils.RedisUtilPool;
 import com.cool.store.vo.PartnerBaseInfoVO;
 import com.cool.store.vo.PartnerUserInfoVO;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -38,6 +39,7 @@ import java.util.Date;
  * @Version 1.0
  */
 @Service
+@Slf4j
 public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService {
 
     @Resource
@@ -76,6 +78,8 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService {
      */
     @Override
     public Boolean submitPartnerBaseInfo(PartnerBaseInfoRequest request, PartnerUserInfoVO currentUser) {
+        log.info("HyPartnerBaseInfoServiceImpl#submitPartnerBaseInfo request:{}", JSONObject.toJSONString(request));
+
         String cacheKey = MessageFormat.format(RedisConstant.PARTNER_BASEINFO_CACHE_KEY, request.getPartnerId(), request.getPartnerLineId());
         if(!request.getSubmitFlag()){
             // 自动保存时
@@ -101,6 +105,12 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService {
             hyPartnerBaseInfoDO.setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_1.getCode()));
             hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(hyPartnerBaseInfoDO);
 
+            HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(request.getPartnerId());
+            if(!hyPartnerUserInfoDO.getUsername().equals(request.getUsername())){
+                hyPartnerUserInfoDO.setUsername(request.getUsername());
+                hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO);
+            }
+
             HyPartnerTaskInfoLogDO logDO = new  HyPartnerTaskInfoLogDO(request.getPartnerId(), request.getPartnerLineId(), WorkflowStageEnum.INTENT.getCode(), WorkflowStatusEnum.INTENT_1.getCode(), currentUser.getPartnerId(), currentUser.getUsername(), null);
 
             hyPartnerTaskInfoLogDAO.insertSelective(logDO);

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

@@ -146,6 +146,11 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         }
         redisUtilPool.delKey(cacheKey);
         if(StringUtils.isNotBlank(request.getWantShopArea())){
+            HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(request.getPartnerId());
+            hyPartnerUserInfoDO.setWantShopArea(request.getWantShopArea());
+            hyPartnerUserInfoDO.setLiveArea(request.getLiveArea());
+            hyPartnerUserInfoDO.setAcceptAdjustType(request.getAcceptAdjustType());
+            hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO);
             HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(request.getWantShopArea()));
             return hyOpenAreaInfoDO != null ? hyOpenAreaInfoDO.getAreaStatus() : null;
         }

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

@@ -2,6 +2,8 @@ package com.cool.store.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -251,18 +253,33 @@ public class InterviewServiceImpl implements InterviewService {
      */
     @Override
     @Transactional
-    public EnterInterviewVO enterInterviewRoom(EnterInterviewDto dto) {
+    public EnterInterviewVO enterInterviewRoom(EnterInterviewDto dto) throws ApiException {
         try {
-            //如果面试间状态不是已开放，就不让进
+            //房间状态
             Integer roomStatus = hyPartnerInterviewPlanMapper.getRoomStatus(dto.getInterviewPlanId());
-            if (!roomStatus.equals(RoomStatus.OPEN.getCode())) {
+            //面试流程状态
-                throw new RuntimeException();
+            String status = hyPartnerInterviewMapper.getStatus(dto.getInterviewPlanId());
+            //如果面试间状态是 0 待开放或者面试流程状态是 2 待面试，就不让进
+            //再判断时间是否是正确的时间
+            if (roomStatus.equals(RoomStatus.WAIT_FOR_OPEN.getCode()) || WorkflowStatusEnum.INTERVIEW_2.getCode().equals(status)) {
+                HyPartnerInterviewPlanDO interviewPlan = hyPartnerInterviewPlanMapper.getInterviewPlanById(dto.getInterviewPlanId());
+                //面试预期开始时间
+                DateTime exceptTime = DateUtil.offsetMinute(interviewPlan.getStartTime(), -5);
+                //面试结束时间
+                DateTime endTime = DateUtil.parseDateTime(DateUtil.formatDateTime(interviewPlan.getEndTime()));
+                DateTime now = DateUtil.date();
+                //如果当前时间在预期开始时间和结束时间之间
+                //修改面试状态和房间状态（修改房间状态在后面 hyPartnerInterviewPlanDO 中一并修改）
+                if (exceptTime.isBefore(now) && now.isBefore(endTime)) {
+                    //1. 将面试状态改为 --> 2 已开始
+                    interviewDAO.updateInterviewWorkflowStatus(dto.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_3);
+                    //hyPartnerInterviewDO.setStatus(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode()));
+                } else {
+                    throw new ApiException(ErrorCodeEnum.ROOM_STATUS_ERROR);
+                }
             }
             HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO();
             hyPartnerInterviewDO.setInterviewPlanId(Long.parseLong(dto.getInterviewPlanId()));
-            //1. 将面试状态改为 --> 2已开始
-            interviewDAO.updateInterviewWorkflowStatus(dto.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_3);
-//            hyPartnerInterviewDO.setStatus(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode()));
             //2. 修改加盟商或面试官进入面试时间
             //加盟商
             if (dto.getUserType().equals(2)) {
@@ -274,21 +291,25 @@ public class InterviewServiceImpl implements InterviewService {
             hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO);
             HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO();
             hyPartnerInterviewPlanDO.setId(Long.parseLong(dto.getInterviewPlanId()));
+            //修改面试房间状态
+            hyPartnerInterviewPlanDO.setRoomStatus(RoomStatus.OPEN.getCode());
             //3. TODO（待确认） 修改面试实际开始时间，以第一个人进来的时间为准，后续不再修改
             hyPartnerInterviewPlanMapper.updateActualStartTime(hyPartnerInterviewPlanDO.getId(), DateUtil.now());
             //4. 加盟商如果进入了，就修改面试计划表 is_partner_interview 字段
             if (dto.getUserType().equals(2)) {
                 hyPartnerInterviewPlanDO.setIsPartnerInterview(1);
-                hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO);
             }
+            hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO);
             //5. 查询对应的面试官id、姓名及加盟商姓名
             EnterInterviewVO vo = hyPartnerInterviewMapper.getInterviewerByInterviewPlanId(dto.getInterviewPlanId());
             //6. 生成 userSign
             String userSig = TRTCUtils.genUserSig(sdkAppId, key, dto.getUserId());
             vo.setUserSign(userSig);
             return vo;
+        } catch (ApiException apiException) {
+            throw apiException;
         } catch (Exception e) {
-            throw new ServiceException(ErrorCodeEnum.INTERVIEW_ENTER_FAIL);
+            throw new ApiException(ErrorCodeEnum.INTERVIEW_ENTER_FAIL);
         }
     }
 

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

@@ -2,6 +2,7 @@ package com.cool.store.service.impl;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.cool.store.dao.HyInterviewDAO;
 import com.cool.store.dto.partner.EnterInterviewDto;
@@ -69,18 +70,33 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService {
      */
     @Override
     @Transactional
-    public EnterInterviewVO enterInterviewRoom(EnterInterviewDto dto) {
+    public EnterInterviewVO enterInterviewRoom(EnterInterviewDto dto) throws ApiException {
         try {
-            //如果面试间状态不是已开放，就不让进
+            //房间状态
             Integer roomStatus = interviewPlanMapper.getRoomStatus(dto.getInterviewPlanId());
-            if (!roomStatus.equals(RoomStatus.OPEN.getCode())) {
+            //面试流程状态
-                throw new RuntimeException();
+            String status = interviewMapper.getStatus(dto.getInterviewPlanId());
+            //如果面试间状态是 0 待开放或者面试流程状态是 2 待面试，就不让进
+            //再判断时间是否是正确的时间
+            if (roomStatus.equals(RoomStatus.WAIT_FOR_OPEN.getCode()) || WorkflowStatusEnum.INTERVIEW_2.getCode().equals(status)) {
+                HyPartnerInterviewPlanDO interviewPlan = interviewPlanMapper.getInterviewPlanById(dto.getInterviewPlanId());
+                //面试预期开始时间
+                DateTime exceptTime = DateUtil.offsetMinute(interviewPlan.getStartTime(), -5);
+                //面试结束时间
+                DateTime endTime = DateUtil.parseDateTime(DateUtil.formatDateTime(interviewPlan.getEndTime()));
+                DateTime now = DateUtil.date();
+                //如果当前时间在预期开始时间和结束时间之间
+                //修改面试状态和房间状态（修改房间状态在后面 hyPartnerInterviewPlanDO 中一并修改）
+                if (exceptTime.isBefore(now) && now.isBefore(endTime)) {
+                    //1. 将面试状态改为 --> 2 已开始
+                    interviewDAO.updateInterviewWorkflowStatus(dto.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_3);
+                    //hyPartnerInterviewDO.setStatus(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode()));
+                } else {
+                    throw new ApiException(ErrorCodeEnum.ROOM_STATUS_ERROR);
+                }
             }
             HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO();
             hyPartnerInterviewDO.setInterviewPlanId(Long.parseLong(dto.getInterviewPlanId()));
-            //1. 将面试状态改为 --> 2已开始
-            interviewDAO.updateInterviewWorkflowStatus(dto.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_3);
-//            hyPartnerInterviewDO.setStatus(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode()));
             //2. 修改加盟商或面试官进入面试时间
             //加盟商
             if (dto.getUserType().equals(2)) {
@@ -92,21 +108,25 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService {
             interviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO);
             HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO();
             hyPartnerInterviewPlanDO.setId(Long.parseLong(dto.getInterviewPlanId()));
+            //修改面试房间状态
+            hyPartnerInterviewPlanDO.setRoomStatus(RoomStatus.OPEN.getCode());
             //3. TODO（待确认） 修改面试实际开始时间，以第一个人进来的时间为准，后续不再修改
             interviewPlanMapper.updateActualStartTime(hyPartnerInterviewPlanDO.getId(), DateUtil.now());
             //4. 加盟商如果进入了，就修改面试计划表 is_partner_interview 字段
             if (dto.getUserType().equals(2)) {
                 hyPartnerInterviewPlanDO.setIsPartnerInterview(1);
-                interviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO);
             }
+            interviewPlanMapper.updateByPrimaryKeySelective(hyPartnerInterviewPlanDO);
             //5. 查询对应的面试官id、姓名及加盟商姓名
             EnterInterviewVO vo = interviewMapper.getInterviewerByInterviewPlanId(dto.getInterviewPlanId());
             //6. 生成 userSign
             String userSig = TRTCUtils.genUserSig(sdkAppId, key, dto.getUserId());
             vo.setUserSign(userSig);
             return vo;
+        } catch (ApiException apiException) {
+            throw apiException;
         } catch (Exception e) {
-            throw new ServiceException(ErrorCodeEnum.INTERVIEW_ENTER_FAIL);
+            throw new ApiException(ErrorCodeEnum.INTERVIEW_ENTER_FAIL);
         }
     }
 

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

@@ -1,4 +1,5 @@
 package com.cool.store.service.impl;
+import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.dao.HyOpenAreaInfoDAO;
 import com.cool.store.dao.HyPartnerUserInfoDAO;
@@ -13,6 +14,7 @@ import com.cool.store.service.HyPartnerLineInfoService;
 import com.cool.store.service.PartnerUserInfoService;
 import com.cool.store.vo.ApplyBaseInfoVO;
 import com.cool.store.vo.InviteCodeDetailVO;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,6 +23,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Service
+@Slf4j
 public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
 
     @Autowired
@@ -76,6 +79,7 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
 
     @Override
     public ApplyBaseInfoVO updatePartnerUserInfo(PartnerUserInfoRequest partnerUserInfoRequest) {
+        log.info("PartnerUserInfoServiceImpl#updatePartnerUserInfo partnerUserInfoRequest:{}", JSONObject.toJSONString(partnerUserInfoRequest));
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(String.valueOf(partnerUserInfoRequest.getPartnerId()));
         if (hyPartnerUserInfoDO == null){
             throw new ServiceException(ErrorCodeEnum.PARTNER_USER_NOT_EXIST);

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

@@ -109,6 +109,9 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
                 hyPartnerUserPlatformBindDO.setBindTime(new Date());
                 hyPartnerUserPlatformBindDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId());
                 hyPartnerUserPlatformBindDAO.insertSelective(hyPartnerUserPlatformBindDO);
+            }else if(!hyPartnerUserPlatformBindDO.getPartnerId().equals(hyPartnerUserInfoDO.getPartnerId())){
+                hyPartnerUserPlatformBindDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId());
+                hyPartnerUserPlatformBindDAO.updateByPrimaryKeySelective(hyPartnerUserPlatformBindDO);
             }
             BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO);
             HyPartnerLineInfoDO lineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId());
@@ -171,7 +174,8 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(mobile);
         BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO);
         HyPartnerUserPlatformBindDO hyPartnerUserPlatformBindDO =  hyPartnerUserPlatformBindDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId());
-        userInfoVO.setOpenid(hyPartnerUserPlatformBindDO.getPlatformUserId());
+
+        userInfoVO.setOpenid(hyPartnerUserPlatformBindDO != null ? hyPartnerUserPlatformBindDO.getPlatformUserId() : "");
         if(StringUtils.isNotBlank(hyPartnerUserInfoDO.getWantShopArea())){
             HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea()));
             userInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/", " ").trim());

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

@@ -70,7 +70,7 @@ public class InterviewController {
 
     @PostMapping("/enter")
     @ApiOperation("进入面试房间")
-    public ResponseResult<EnterInterviewVO> enterInterviewRoom(@RequestBody EnterInterviewDto dto) {
+    public ResponseResult<EnterInterviewVO> enterInterviewRoom(@RequestBody EnterInterviewDto dto) throws ApiException {
         return ResponseResult.success(interviewService.enterInterviewRoom(dto));
     }
 

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

@@ -38,7 +38,7 @@ public class InterviewController {
 
     @PostMapping("/enter")
     @ApiOperation("进入面试间")
-    public ResponseResult<EnterInterviewVO> enterInterviewRoom(@RequestBody EnterInterviewDto dto) {
+    public ResponseResult<EnterInterviewVO> enterInterviewRoom(@RequestBody EnterInterviewDto dto) throws ApiException {
         return ResponseResult.success(interviewService.enterInterviewRoom(dto));
     }