Merge branch 'fixbug/fixoff' into 'master'

feat: [1006901-2] 外链优化拓展

See merge request rays/pcloud-book!1544

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AppletRecordBizImpl.java

@@ -784,7 +784,7 @@ public class AppletRecordBizImpl implements AppletRecordBiz {
                             Map<String, Boolean> bookAuthMap = bookAuthServeBiz.listIsOpen4ServeIdsAndQrcode(sceneId, Lists.newArrayList(appDto.getAppId()));
                             if (CollUtil.isEmpty(bookAuthMap) || null == bookAuthMap.get(MessageFromTypeEnum.APP.value + appDto.getAppId()) || false == bookAuthMap.get(MessageFromTypeEnum.APP.value + appDto.getAppId())) {
                                 //外链跳转到指定中间页
-                                String jumpUrl =  BookProps.getProductDomain() + "transfer?offId" + accountSettingDto.getAccountSettingId() + "&appId=" + appDto.getAppId() + "&url=" +
+                                String jumpUrl =  BookProps.getProductDomain() + "transfer?offId=" + accountSettingDto.getAccountSettingId() + "&appId=" + appDto.getAppId() + "&url=" +
                                         URLEncoder.encode(appDto.getTurnUrl()) + "&sceneId=" + sceneId + "&wechatUserId=" + wechatUserId;
                                 appletAppOrProductDTO.setResultUrl(jumpUrl);
                             }
@@ -869,7 +869,7 @@ public class AppletRecordBizImpl implements AppletRecordBiz {
                             Map<String, Boolean> bookAuthMap = bookAuthServeBiz.listIsOpen4ServeIdsAndQrcode(sceneId, Lists.newArrayList(productDto.getProductId()));
                             if (CollUtil.isEmpty(bookAuthMap) || null == bookAuthMap.get(MessageFromTypeEnum.PRODUCT.value + productDto.getProductId()) || false == bookAuthMap.get(MessageFromTypeEnum.PRODUCT.value + productDto.getProductId())) {
                                 //外链跳转到指定中间页
-                                String jumpUrl =  BookProps.getProductDomain() + "transfer?offId" + accountSettingDto.getAccountSettingId() +  "&url=" +
+                                String jumpUrl =  BookProps.getProductDomain() + "transfer?offId=" + accountSettingDto.getAccountSettingId() +  "&url=" +
                                         URLEncoder.encode(productDto.getSkipUrl()) + "&sceneId=" + sceneId + "&wechatUserId=" + wechatUserId +  "&productId=" + productDto.getProductId() ;
                                 appletAppOrProductDTO.setResultUrl(jumpUrl);
                             }

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java

@@ -3992,7 +3992,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                         } else {
                             if (CollUtil.isEmpty(finalBookAuthMap) || null == finalBookAuthMap.get(MessageFromTypeEnum.APP.value + appDto.getAppId()) || false == finalBookAuthMap.get(MessageFromTypeEnum.APP.value + appDto.getAppId())) {
                                 //外链跳转到指定中间页
-                                String jumpUrl =  BookProps.getProductDomain() + "transfer?offId" + officialAccountsId + "&appId=" + appDto.getAppId() + "&url=" +
+                                String jumpUrl =  BookProps.getProductDomain() + "transfer?offId=" + officialAccountsId + "&appId=" + appDto.getAppId() + "&url=" +
                                         URLEncoder.encode(appDto.getTurnUrl()) + "&sceneId=" + byId.getSceneId() + "&wechatUserId=" + wechatUserId;
                                 e.setResultUrl(jumpUrl);
                             }
@@ -4021,7 +4021,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                         } else if (null != wechatUserId && adviserPrice.equals(0D) ){
                             if (CollUtil.isEmpty(finalBookAuthMap1) || null == finalBookAuthMap1.get(MessageFromTypeEnum.PRODUCT.value +  e.getServeId()) || false == finalBookAuthMap1.get(MessageFromTypeEnum.PRODUCT.value +  e.getServeId())) {
                                 //外链跳转到指定中间页
-                                String jumpUrl =  BookProps.getProductDomain() + "transfer?offId" + officialAccountsId + "&"  + "&url=" +
+                                String jumpUrl =  BookProps.getProductDomain() + "transfer?offId=" + officialAccountsId + "&"  + "&url=" +
                                         URLEncoder.encode(productDto.getSkipUrl()) + "&sceneId=" + byId.getSceneId() + "&wechatUserId=" + wechatUserId + "&productId=" + e.getServeId() ;
                                 e.setResultUrl(jumpUrl);
                             }