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

2023-06-25 20:14:55 +08:00
parent db7973a80a 6ba879d09c
commit 7e6ddefab1
12 changed files with 56 additions and 42 deletions
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
@@ -160,20 +160,22 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
            return intentInfoVO;
        }
        HyPartnerIntentInfoDO intentInfoDO = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(userInfoVO.getPartnerId(), lineId);
+        PartnerIntentInfoVO intentInfoVO = null;
        if (intentInfoDO != null){
-            PartnerIntentInfoVO intentInfoVO = convertPartnerIntentApplyInfoDOToVO(intentInfoDO);
-            if(StringUtils.isBlank(intentInfoVO.getLiveArea())){
-                intentInfoVO.setLiveArea(userInfoVO.getLiveArea());
-            }
-            if(StringUtils.isBlank(intentInfoVO.getWantShopArea())){
-                intentInfoVO.setWantShopArea(userInfoVO.getWantShopArea());
-            }
-            if(Objects.isNull(intentInfoVO.getAcceptAdjustType())){
-                intentInfoVO.setAcceptAdjustType(userInfoVO.getAcceptAdjustType());
-            }
-            return intentInfoVO;
+            intentInfoVO = convertPartnerIntentApplyInfoDOToVO(intentInfoDO);
+        }else {
+            intentInfoVO = new PartnerIntentInfoVO();
        }
-        return null;
+        if(StringUtils.isBlank(intentInfoVO.getLiveArea())){
+            intentInfoVO.setLiveArea(userInfoVO.getLiveArea());
+        }
+        if(StringUtils.isBlank(intentInfoVO.getWantShopArea())){
+            intentInfoVO.setWantShopArea(userInfoVO.getWantShopArea());
+        }
+        if(Objects.isNull(intentInfoVO.getAcceptAdjustType())){
+            intentInfoVO.setAcceptAdjustType(userInfoVO.getAcceptAdjustType());
+        }
+        return intentInfoVO;
    }

    private void fillIntentInfo(HyPartnerIntentInfoDO intentInfoDO, PartnerIntentInfoRequest request) {
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
@@ -434,8 +434,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
        if (hyIntendDevelopementMappingDO==null){
            return Boolean.FALSE;
        }
-        //如果是私海线索 不需要重新分配招商经理  或者跟进次数大于1
-        if (HyPartnerLineInfo.getLineStatus()==1||CollectionUtils.isEmpty(lineFollowHistoryList)){
+        //如果是私海线索 不需要重新分配招商经理  或者跟进次数大于等于1
+        if ((HyPartnerLineInfo != null && HyPartnerLineInfo.getLineStatus()==1) || CollectionUtils.isNotEmpty(lineFollowHistoryList)){
            return Boolean.FALSE;
        }
        if(HyPartnerLineInfo == null){
--- a/coolstore-partner-webb/src/main/java/com/cool/store/config/TRTCCallbackFilter.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/config/TRTCCallbackFilter.java
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
@Slf4j
 public class TRTCCallbackFilter implements Filter {

-    @Value("${trtc.secretKey}")
+    @Value("${trtc.video.callback.secretKey:null}")
    private String secretkey;

    @Override
@@ -31,31 +31,31 @@ public class TRTCCallbackFilter implements Filter {

    @Override
    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-//        HttpServletRequest request = (HttpServletRequest) servletRequest;
-//        String uri = request.getRequestURI();
-//        //不是腾讯云音视频回调请求
-//        if (!uri.startsWith("/partner/pc/video")) {
-//            filterChain.doFilter(servletRequest, servletResponse);
-//            return;
-//        }
-//        if (!"POST".equals(request.getMethod())) {
-//            return;
-//        }
-//        String requestBody = request.getReader().lines().collect(Collectors.joining());
-//        //回调的签名
-//        String sign = request.getHeader("Sign");
-//        //服务器端生成的签名
-//        String newSign = "";
-//        try {
-//            newSign = getResultSign(secretkey, requestBody);
-//        } catch (Exception e) {
-//            log.error("腾讯云音视频回调签名生成错误，e：\t{}", e.getMessage());
-//            return;
-//        }
-//        if (StringUtil.isEmpty(sign) || !newSign.equals(sign)) {
-//            log.error("腾讯云音视频回调签名错误, sign：\t{}, newSign：\t{}", sign, newSign);
-//            return;
-//        }
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        String uri = request.getRequestURI();
+        //不是腾讯云音视频回调请求
+        if (!uri.startsWith("/partner/pc/video")) {
+            filterChain.doFilter(servletRequest, servletResponse);
+            return;
+        }
+        if (!"POST".equals(request.getMethod())) {
+            return;
+        }
+        String requestBody = request.getReader().lines().collect(Collectors.joining());
+        //回调的签名
+        String sign = request.getHeader("Sign");
+        //服务器端生成的签名
+        String newSign = "";
+        try {
+            newSign = getResultSign(secretkey, requestBody);
+        } catch (Exception e) {
+            log.error("腾讯云音视频回调签名生成错误，e：\t{}", e.getMessage());
+            return;
+        }
+        if (StringUtil.isEmpty(sign) || !newSign.equals(sign)) {
+            log.error("腾讯云音视频回调签名错误, sign：\t{}, newSign：\t{}", sign, newSign);
+            return;
+        }
        filterChain.doFilter(servletRequest, servletResponse);
    }

--- 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
@@ -46,7 +46,9 @@ public class TokenValidateFilter implements Filter {
                    "/partner/pc/doc.html","/partner/pc/v2/api-docs","/**/test/**","/partner/pc/feiShuLogin","/partner/pc/oss/getUploadFileConfig",
                    "/**/swagger*/**", "/**/webjars/**",
                    //腾讯音视频回调，单独做验签
-                    "/partner/pc/video/**");
+                    "/partner/pc/video/**",
+                    //TODO 800回调地址暂时不做验证
+                    "/qualificationReview/callback");


    /**
--- a/coolstore-partner-webb/src/main/resources/application-ab.properties
+++ b/coolstore-partner-webb/src/main/resources/application-ab.properties
@@ -55,6 +55,7 @@ cdn.url=https://testhsaypic.coolstore.cn
 #TRTC
 trtc.sdkAppId=1400811820
 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
+trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8

 weixin.appId=wx6f984e535e571818
 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
--- a/coolstore-partner-webb/src/main/resources/application-dev.properties
+++ b/coolstore-partner-webb/src/main/resources/application-dev.properties
@@ -52,6 +52,7 @@ corp.id = 171cddee76471740
 #TRTC
 trtc.sdkAppId=1400811820
 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
+trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8

 weixin.appId=wx6f984e535e571818
 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
--- a/coolstore-partner-webb/src/main/resources/application-hd.properties
+++ b/coolstore-partner-webb/src/main/resources/application-hd.properties
@@ -52,6 +52,7 @@ corp.id = 171cddee76471740
 #TRTC
 trtc.sdkAppId=1400811820
 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
+trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8

 weixin.appId=wx6f984e535e571818
 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
--- a/coolstore-partner-webb/src/main/resources/application-local.properties
+++ b/coolstore-partner-webb/src/main/resources/application-local.properties
@@ -58,6 +58,7 @@ cdn.url=https://testhsaypic.coolstore.cn
 #TRTC
 trtc.sdkAppId=1400811820
 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
+trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8

 weixin.appId=wx6f984e535e571818
 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
--- a/coolstore-partner-webb/src/main/resources/application-online.properties
+++ b/coolstore-partner-webb/src/main/resources/application-online.properties
@@ -52,6 +52,7 @@ corp.id = 171cddee76471740
 #TRTC
 trtc.sdkAppId=1400811820
 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
+trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8

 weixin.appId=wx6f984e535e571818
 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
--- a/coolstore-partner-webb/src/main/resources/application-pre.properties
+++ b/coolstore-partner-webb/src/main/resources/application-pre.properties
@@ -52,6 +52,7 @@ corp.id = 171cddee76471740
 #TRTC
 trtc.sdkAppId=1400811820
 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
+trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8

 weixin.appId=wx6f984e535e571818
 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
--- a/coolstore-partner-webb/src/main/resources/application-test.properties
+++ b/coolstore-partner-webb/src/main/resources/application-test.properties
@@ -52,6 +52,7 @@ corp.id = 171cddee76471740
 #TRTC
 trtc.sdkAppId=1400811820
 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
+trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8

 weixin.appId=wx6f984e535e571818
 weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
--- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java
+++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java
@@ -61,7 +61,10 @@ public class PartnerController {
    public ResponseResult<Boolean> getSubmitIntentionApplyFlag(){
        PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser();
        PartnerBaseInfoVO partnerBaseInfoVO = hyPartnerBaseInfoService.queryPartnerBaseInfo(userInfoVO.getPartnerId(), userInfoVO.getPartnerLineId());
-        Boolean submitFlag = partnerBaseInfoVO.getStatus() > Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode());
+        Boolean submitFlag = false;
+        if(partnerBaseInfoVO.getStatus() != null){
+            submitFlag = partnerBaseInfoVO.getStatus() > Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode());
+        }
        return ResponseResult.success(submitFlag);
    }