Merge branch 'fixbug/1032516' into 'master'

bug: [1032516] 落地页菜单问题

See merge request rays/pcloud-book!1495

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

@@ -1546,8 +1546,17 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 resourcePageVO.setAccountSettingId(accountSettingDto.getAccountSettingId());
             }
             resourcePageVO.setChannelId(channelId);
+
+            if(resourcePageVO.getId() != null){
+                // 实体店铺
+                resourcePageVO.setResourcePageBookstoreList(resourcePageBookstoreBiz.getByResourcePageId(resourcePageVO.getId(), resourcePageVO.getChannelId(), wechatUserId, ResourcePageFixtureTypeEnum.BOOKSTORE));
+                // 优惠券
+                resourcePageVO.setResourcePageCouponList(resourcePageBookstoreBiz.getByResourcePageId(resourcePageVO.getId(), resourcePageVO.getChannelId(), wechatUserId, ResourcePageFixtureTypeEnum.COUPONS));
+            }
         }
         List<ResourcePageNavigation> navigations = resourcePageNavigationDao.getByPageId(resourcePageVO.getId());
+        // 加载跳转数据
+        this.fillCustomServe(navigations, wechatUserId);
         resourcePageVO.setNavigationList(navigations);
         return resourcePageVO;
     }

pcloud-service-book/src/main/resources/mapper/group/ResourcePageDao.xml

@@ -129,7 +129,8 @@
         p.navigation_color,
         p.navigation_format,
         p.font_color,
-        p.transparency
+        p.transparency,
+        p.navigation_jump_type
         FROM
         resource_page p
         LEFT JOIN resource_page_item i ON p.id = i.resource_page_id