Merge branch 'feature/1004152' into 'master'

feat:[1004152] 自有码进h5引导关注公众号

See merge request rays/pcloud-book!1136

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

@@ -3059,7 +3059,8 @@ public class BookGroupBizImpl implements BookGroupBiz {
                     bookGroupServe.setServeName(productDto.getProductName());
                     bookGroupServe.setPicUrl(productDto.getCoverImg());
                     if (productDto.getProductTypeDto() != null) {
-                        bookGroupServe.setFromType(productDto.getProductTypeDto().getTypeCode());
+                        bookGroupServe.setTypeCode(productDto.getProductTypeDto().getTypeCode());
+                        bookGroupServe.setFromType(productDto.getProductTypeDto().getTypeName());
                     }
                     bookGroupServe.setIsSuper(isSuperMap.get(bookGroupServe.getServeId()));
                 }
@@ -3068,8 +3069,9 @@ public class BookGroupBizImpl implements BookGroupBiz {
                 AppDto appDto = appDtoMap.get(bookGroupServe.getServeId());
                 if (appDto != null) {
                     bookGroupServe.setServeName(appDto.getTitle());
-                    bookGroupServe.setFromType(appDto.getTypeCode());
+                    bookGroupServe.setTypeCode(appDto.getTypeCode());
                     bookGroupServe.setPicUrl(appDto.getSquareImg());
+                    bookGroupServe.setFromType(appDto.getTypeName());
                 }
             }
         }
@@ -6185,6 +6187,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
         bookGroupSceneDTO.setSceneId(bookGroupDTO.getSceneId());
         QrcodeSceneDto qrcodeSceneDto = qrcodeSceneConsr.getById(bookGroupDTO.getSceneId());
         bookGroupSceneDTO.setQrcodeUrl(null == qrcodeSceneDto?null:qrcodeSceneDto.getQrcodeUrl());
+        //原流程保留
         List<BookServeDTO> bookServeDTOS = getBookAndBookGroupServeIds(bookGroupDTO.getCreateUser(), bookGroupDTO.getBookId(), bookGroupDTO.getChannelId());
         if (CollUtil.isEmpty(bookServeDTOS)) {
             return bookGroupSceneDTO;
@@ -6209,6 +6212,16 @@ public class BookGroupBizImpl implements BookGroupBiz {
         // 要求少于4个的时候要随机补成4个
         fillMpServices(mpServices,0,6);
         bookGroupSceneDTO.setMpServices(mpServices);
+        //新流程改编为返回书所配置的资源
+        List<BookGroupServe> serveList = bookGroupServeDao.getListByBookGroupId(bookGroupId);
+        if (ListUtils.isEmpty(serveList)) {
+            return bookGroupSceneDTO;
+        }
+        fillServeInfo(serveList);
+        for (BookGroupServe bookGroupServe : serveList) {
+
+        }
+        bookGroupSceneDTO.setBookServices(serveList);
         return bookGroupSceneDTO;
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/group/dto/BookGroupSceneDTO.java

 package com.pcloud.book.group.dto;
 
+import com.pcloud.book.group.entity.BookGroupServe;
 import com.pcloud.common.dto.BaseDto;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -35,4 +36,6 @@ public class BookGroupSceneDTO extends BaseDto {
     private String bookName;
     @ApiModelProperty("公众号服务分类列表")
     private List<Integer> mpServices;
+    @ApiModelProperty("公众号配置的资源")
+    private List<BookGroupServe> bookServices;
 }