bug: [1006828] 修复接口变更的跳转问题

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

@@ -539,7 +539,8 @@ public interface ResourcePageBiz {
     List<Integer> getColumnTypeByPageId4Wechat(Long resourcePageId, Long wechatUserId, Long bookId, Long adviserId, Long channelId, Integer enableAdverting, Long navigationId);
 
     //优化  此处把模块分开调接口  columnType
-    List<ResourceColumnAndServeVO> getColumnAndServeListByPageId4WechatV2(Long resourcePageId, Long wechatUserId, Long bookId, Long adviserId, Long channelId, Integer enableAdverting, Long navigationId,Integer columnType);
+    List<ResourceColumnAndServeVO> getColumnAndServeListByPageId4WechatV2(Long resourcePageId, Long wechatUserId, Long bookId, Long adviserId, Long channelId,
+                                                                          Integer enableAdverting, Long navigationId,Integer columnType, Long officialAccountsId);
 
     /**
      * 保存分享配置

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

@@ -3692,7 +3692,11 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         }
         fillSelfPic(resourcePageItemVOList);
         //填充跳转地址
+        try {
             fillJumpUrl(resourcePageItemVOList, wechatUserId, resourcePageId, officialAccountsId);
+        } catch (Exception e) {
+            log.error("book.fillJumpUrl失败");
+        }
         return resourceColumnAndServeVOS;
     }
 
@@ -3741,7 +3745,8 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
 
     //优化  此处把模块分开调接口  通过columnType
     @Override
-    public List<ResourceColumnAndServeVO> getColumnAndServeListByPageId4WechatV2(Long resourcePageId, Long wechatUserId, Long bookId, Long adviserId, Long channelId, Integer enableAdverting, Long navigationId, Integer columnType) {
+    public List<ResourceColumnAndServeVO> getColumnAndServeListByPageId4WechatV2(Long resourcePageId, Long wechatUserId, Long bookId, Long adviserId,
+                                                                                 Long channelId, Integer enableAdverting, Long navigationId, Integer columnType, Long officialAccountsId) {
         List<ResourceColumnAndServeVO> serveVOS=new ArrayList<>();
         if(null!= columnType && columnType!=0) {
             serveVOS = resourcePageColumnDao.getColumnListByPageId(resourcePageId, navigationId, columnType);
@@ -3818,6 +3823,8 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             return new ArrayList<>();
         }
         fillSelfPic(resourcePageItemVOList);
+        //填充跳转地址
+        fillJumpUrl(resourcePageItemVOList, wechatUserId, resourcePageId, officialAccountsId);
         return serveVOS;
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/ResourcePageFacade.java

@@ -139,7 +139,9 @@ public class ResourcePageFacade {
                                                                @RequestParam(value = "navigationId", required = false) Long navigationId,
                                                                @RequestParam(value = "columnType", required = false) Integer columnType){
         Long wechatUserId = Cookie.getId(userInfo,Cookie._WECHAT_USER_ID);
-        return new ResponseDto<>(resourcePageBiz.getColumnAndServeListByPageId4WechatV2(resourcePageId, wechatUserId, bookId, adviserId, channelId, enableAdverting, navigationId,columnType));
+        Long officialAccountsId = Cookie.getId(userInfo, Cookie._OFFICIAL_ACCOUNTS_ID);
+        return new ResponseDto<>(resourcePageBiz.getColumnAndServeListByPageId4WechatV2(resourcePageId, wechatUserId, bookId, adviserId,
+                channelId, enableAdverting, navigationId,columnType, officialAccountsId));
     }
 
     @ApiOperation("客户端分页查栏目资源")