From 9abdbfcb2a52663f78c21dbb863a916f9b3ffd69 Mon Sep 17 00:00:00 2001 From: pserimal Date: Mon, 26 Jun 2023 14:21:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=85=BE=E8=AE=AF?= =?UTF-8?q?=E9=9F=B3=E8=A7=86=E9=A2=91=E4=B8=8A=E4=BC=A0=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=88=90=E5=8A=9F=E6=97=A5=E5=BF=97=E5=8F=8A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/mapper/HyPartnerInterviewMapper.java | 8 ++++++++ .../resources/mapper/HyPartnerInterviewMapper.xml | 11 +++++++++++ .../cool/store/service/impl/InterviewServiceImpl.java | 1 - .../service/impl/PartnerInterviewServiceImpl.java | 2 -- .../cool/store/service/impl/TRTCVideoServiceImpl.java | 6 +++--- .../com/cool/store/controller/VideoController.java | 1 + 6 files changed, 23 insertions(+), 6 deletions(-) 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-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-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); //不是音视频上传的回调 From e380b13ec5436af6056bc58ca1af5e8872d6d453 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Mon, 26 Jun 2023 14:23:21 +0800 Subject: [PATCH 2/5] fix --- .../src/main/resources/mapper/RegionMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 9e3081dd592601c8a18aa374f74ab41937ed5133 Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Mon, 26 Jun 2023 14:34:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WechatMiniAppServiceImpl.java | 62 ++++++++++--------- 1 file changed, 33 insertions(+), 29 deletions(-) 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..4bf18a7ee 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; } From 6ea69779380e402705fe55f7c25a16453797a0a1 Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Mon, 26 Jun 2023 14:37:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=84=8F=E5=90=91?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/WechatMiniAppServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4bf18a7ee..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 @@ -159,7 +159,7 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { } oldUserInfo.setMobile(newMobile); hyPartnerUserInfoDAO.updateByPrimaryKeySelective(oldUserInfo); - //修改意向申请信息中的加盟商名称与手机号 + //修改意向申请信息中的手机号 hyPartnerBaseInfoDAO.updateByPartnerId(null, newMobile, oldUserInfo.getPartnerId()); } return newMobile; From a91701da2912a9791cb8a153ebd247a326b27d7b Mon Sep 17 00:00:00 2001 From: pserimal Date: Mon, 26 Jun 2023 14:48:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?800=E5=9B=9E=E8=B0=83URI=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/config/TokenValidateFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); /**