Merge branch 'feature/raysQrcode' into 'master'

feat: [none] rays码bug

See merge request rays/pcloud-book!1293

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

@@ -477,6 +477,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 resourcePageVO.setChannelId(dto.getChannelId());
                 //预览码放原有的二维码
                 resourcePageVO.setQrcodeUrl(dto.getGroupQrcodeUrl());
+                resourcePageVO.setQrcodeLink(dto.getGroupQrcodeLink());
             }
         } else {
             ResourcePage resourcePage = resourcePageDao.getBySceneId(sceneId);
@@ -492,6 +493,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePageVO.setChannelId(qrcodeSceneDto.getChannelPartyId());
             //预览取原有二维码
             resourcePageVO.setQrcodeUrl(qrcodeSceneDto.getQrcodeUrl());
+            resourcePageVO.setQrcodeLink(qrcodeSceneDto.getUrl());
         }
         Map<Long, AdviserBaseInfoDto> agentMap = adviserConsr.getAdviserId2AdviserInfoDtoMap(Arrays.asList(adviserId));
         if (!MapUtils.isEmpty(agentMap)) {

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageVO.java

@@ -63,4 +63,6 @@ public class ResourcePageVO extends BaseDto {
      * 收藏状态
      */
     private Integer collectState;
+
+    private String qrcodeLink;
 }
\ No newline at end of file

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

@@ -33,7 +33,8 @@
             create_time,
             update_time,
             is_delete,
-            account_setting_id
+            account_setting_id,
+            scene_id
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             #{bookGroupId,jdbcType=BIGINT},
@@ -43,7 +44,8 @@
             NOW(),
             NOW(),
             0,
-            #{accountSettingId}
+            #{accountSettingId},
+            #{sceneId}
         </trim>
     </insert>