diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java index ac540195c..28472bf8e 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java @@ -93,4 +93,12 @@ public interface HyPartnerInterviewMapper { * @return */ String getStatus(String interviewPlanId); + + /** + * 在面试信息表中添加面试录制视频链接 + * @param roomId + * @param videoUrl + */ + void addVideoUrl(@Param("roomId") String roomId, @Param("videoUrl") String videoUrl); + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml index 86078fe33..48dad0be1 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml @@ -478,4 +478,15 @@ WHERE interview_plan_id = #{interviewPlanId} + + + UPDATE hy_partner_interview + SET process_info = IF(process_info IS NULL, #{videoUrl}, CONCAT(process_info, ',' ,#{videoUrl})) + WHERE interview_plan_id = ( + SELECT id + FROM hy_partner_interview_plan + WHERE room_id = #{roomId} + ) + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml index e174f3d00..6ca1f1eb0 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml @@ -206,6 +206,6 @@ \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java index 12c1ddca9..418c4a350 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java @@ -3,7 +3,6 @@ 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; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java index a56a8c229..3074035c1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java @@ -2,7 +2,6 @@ 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; @@ -19,7 +18,6 @@ import com.cool.store.request.ModifyInterviewTimeReq; import com.cool.store.service.PartnerInterviewService; import com.cool.store.utils.TRTCUtils; import com.cool.store.vo.EnterInterviewVO; -import com.cool.store.vo.EnterpriseUserBaseInfoVO; import com.cool.store.vo.PartnerInterviewInfoVO; import com.cool.store.vo.PartnerPassLetterDetailVO; import com.cool.store.vo.interview.InterviewVO; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TRTCVideoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TRTCVideoServiceImpl.java index 7f073e615..9855ae7d2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TRTCVideoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TRTCVideoServiceImpl.java @@ -1,6 +1,6 @@ package com.cool.store.service.impl; -import com.cool.store.mapper.TRTCVideoCallBackMapper; +import com.cool.store.mapper.HyPartnerInterviewMapper; import com.cool.store.request.TRTCVideoCallBackReq; import com.cool.store.service.TRTCVideoService; import org.springframework.beans.factory.annotation.Autowired; @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; public class TRTCVideoServiceImpl implements TRTCVideoService { @Autowired - private TRTCVideoCallBackMapper videoCallBackMapper; + private HyPartnerInterviewMapper interviewMapper; /** * 音视频上传成功后的回调处理 @@ -20,7 +20,7 @@ public class TRTCVideoServiceImpl implements TRTCVideoService { //将视频播放地址拼接到对应的面试信息字段中 String videoUrl = req.getEventInfo().getPayLoad().getTencentVod().getVideoUrl(); String roomId = req.getEventInfo().getRoomId(); - videoCallBackMapper.addVideoUrl(roomId, videoUrl); + interviewMapper.addVideoUrl(roomId, videoUrl); } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java index 610301034..84c3614be 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java @@ -4,10 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.cool.store.constants.CommonConstants; -import com.cool.store.dao.HyOpenAreaInfoDAO; -import com.cool.store.dao.HyPartnerLineInfoDAO; -import com.cool.store.dao.HyPartnerUserInfoDAO; -import com.cool.store.dao.HyPartnerUserPlatformBindDAO; +import com.cool.store.dao.*; import com.cool.store.dto.wx.CodeSessionDTO; import com.cool.store.dto.wx.MiniProgramLoginDTO; import com.cool.store.dto.wx.PhoneInfoDTO; @@ -56,6 +53,8 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { private HyPartnerLineInfoDAO hyPartnerLineInfoDAO; @Resource HyOpenAreaInfoDAO hyOpenAreaInfoDAO; + @Resource + HyPartnerBaseInfoDAO hyPartnerBaseInfoDAO; @Value("${weixin.appId}") private String wxAppId; @@ -91,27 +90,29 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { // 获取手机号码 PhoneInfoDTO phoneInfoDTO = wechatRest.getUserPhoneNumber(param.getMobileCode(), accessToken); if(phoneInfoDTO != null && phoneInfoDTO.getPhoneInfo() != null && StringUtils.isNotBlank(phoneInfoDTO.getPhoneInfo().getPhoneNumber())){ - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); - if(hyPartnerUserInfoDO == null){ - hyPartnerUserInfoDO = new HyPartnerUserInfoDO(); - hyPartnerUserInfoDO.setMobile(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); - // hyPartnerUserInfoDO.setUsername(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); - hyPartnerUserInfoDO.setPartnerId(UUIDUtils.get32UUID()); - hyPartnerUserInfoDO.setAcceptAdjustType(0); - hyPartnerUserInfoDO.setIsWritePartnerKnow(0); - hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO); - } + HyPartnerUserPlatformBindDO hyPartnerUserPlatformBindDO = hyPartnerUserPlatformBindDAO.getByPlatformTypeAndUserId(UserPlatformTypeEnum.WECHAT.getCode(), openid); + HyPartnerUserInfoDO hyPartnerUserInfoDO = null; + // 微信未授权过 if(hyPartnerUserPlatformBindDO == null){ + hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); + if(hyPartnerUserInfoDO == null){ + hyPartnerUserInfoDO = new HyPartnerUserInfoDO(); + hyPartnerUserInfoDO.setMobile(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); + // hyPartnerUserInfoDO.setUsername(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); + hyPartnerUserInfoDO.setPartnerId(UUIDUtils.get32UUID()); + hyPartnerUserInfoDO.setAcceptAdjustType(0); + hyPartnerUserInfoDO.setIsWritePartnerKnow(0); + hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO); + } hyPartnerUserPlatformBindDO = new HyPartnerUserPlatformBindDO(); hyPartnerUserPlatformBindDO.setPlatformType(UserPlatformTypeEnum.WECHAT.getCode()); hyPartnerUserPlatformBindDO.setPlatformUserId(openid); 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); + }else { + hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerUserPlatformBindDO.getPartnerId()); } BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO); HyPartnerLineInfoDO lineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); @@ -158,6 +159,8 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { } oldUserInfo.setMobile(newMobile); hyPartnerUserInfoDAO.updateByPrimaryKeySelective(oldUserInfo); + //修改意向申请信息中的手机号 + hyPartnerBaseInfoDAO.updateByPartnerId(null, newMobile, oldUserInfo.getPartnerId()); } return newMobile; } @@ -171,18 +174,19 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { userInfoVO.setPartnerId(""); return userInfoVO; } - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(mobile); - BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO); - HyPartnerUserPlatformBindDO hyPartnerUserPlatformBindDO = hyPartnerUserPlatformBindDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); - - 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()); - } - HyPartnerLineInfoDO lineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); - if (lineInfoDO != null){ - userInfoVO.setPartnerLineId(lineInfoDO.getId()); + HyPartnerUserPlatformBindDO hyPartnerUserPlatformBindDO = hyPartnerUserPlatformBindDAO.getByPlatformTypeAndUserId(UserPlatformTypeEnum.WECHAT.getCode(), openId); + if(hyPartnerUserPlatformBindDO != null){ + HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerUserPlatformBindDO.getPartnerId()); + BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO); + userInfoVO.setOpenid(hyPartnerUserPlatformBindDO.getPlatformUserId()); + if(StringUtils.isNotBlank(hyPartnerUserInfoDO.getWantShopArea())){ + HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea())); + userInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/", " ").trim()); + } + HyPartnerLineInfoDO lineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId()); + if (lineInfoDO != null){ + userInfoVO.setPartnerLineId(lineInfoDO.getId()); + } } return userInfoVO; } diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java b/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java index c7d1d2c04..98b2e423f 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java @@ -48,7 +48,7 @@ public class TokenValidateFilter implements Filter { //腾讯音视频回调，单独做验签 "/partner/pc/video/**", //TODO 800回调地址暂时不做验证 - "/qualificationReview/callback"); + "/partner/pc/flow/qualificationReview/callback"); /** diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/VideoController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/VideoController.java index fb6bf5a55..f5f83e46a 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/VideoController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/VideoController.java @@ -25,6 +25,7 @@ public class VideoController { @PostMapping("/callback") @ApiOperation("音视频回调（腾讯云回调）") public ResponseResult videoCallback(@RequestBody String requestBody) { + log.info("腾讯音视频上传完成回调，request{}", JSONObject.toJSONString(requestBody)); //由于腾讯云恶事做尽，它的回调参数不是驼峰法，首字母是大写，导致 SpringMVC 映射不上，只能手动映射了 TRTCVideoCallBackReq req = JSONObject.parseObject(requestBody, TRTCVideoCallBackReq.class); //不是音视频上传的回调