Merge branch 'feature/1009295' into 'release'

Feature/1009295

See merge request rays/pcloud-book!1705

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

@@ -81,7 +81,7 @@ import com.pcloud.book.book.dto.EditionAnalysisResultVO;
 import com.pcloud.book.book.dto.EditionAnalysisVO;
 import com.pcloud.book.book.dto.ErpBookApprovalDTO;
 import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
-import com.pcloud.book.book.dto.MoFangBookDto;
+import com.pcloud.book.book.vo.MoFangBookDto;
 import com.pcloud.book.book.dto.MoFangSceneDto;
 import com.pcloud.book.book.dto.ProjectOrderSheetDTO;
 import com.pcloud.book.book.dto.ProjectRelateVO;
@@ -4785,9 +4785,36 @@ public class BookBizImpl implements BookBiz {
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("keyWords",keyWords);
         PageBeanNew<MoFangBookDto> listPageNew = bookDao.listPageNew(new PageParam(currentPage, numPerPage), paramMap, "listMoFangBook");
+        if (listPageNew == null || ListUtils.isEmpty(listPageNew.getRecordList())) {
+            return new PageBeanNew<>(currentPage,numPerPage,null==listPageNew ? 0 : listPageNew.getTotalCount(),new ArrayList<>());
+        }
+        //填充书刊下面的rays码
+        fillSceneInfo(listPageNew.getRecordList());
         return listPageNew;
     }
 
+    private void fillSceneInfo(List<MoFangBookDto> list) {
+        List<Long> bookIds = list.stream().map(a -> a.getBookId()).collect(Collectors.toList());
+        Map<Long, List<QrcodeSceneDto>> sceneMap = channelConsr.listRaysCode(bookIds);
+        for (MoFangBookDto dto : list) {
+            if(CollUtil.isNotEmpty(sceneMap) && null!=dto.getBookId() && sceneMap.containsKey(dto.getBookId())){
+                List<QrcodeSceneDto> qrcodeSceneDtos = sceneMap.get(dto.getBookId());
+                if(CollUtil.isNotEmpty(qrcodeSceneDtos)){
+                    for (QrcodeSceneDto sceneDto : qrcodeSceneDtos) {
+                      if(StrUtil.isNotBlank(sceneDto.getUrl())){
+                          if(sceneDto.getUrl().contains("?")){
+                              sceneDto.setUrl(sceneDto.getUrl() + "&douyin=1");
+                          }else{
+                              sceneDto.setUrl(sceneDto.getUrl() + "?douyin=1");
+                          }
+                      }
+                    }
+                }
+                dto.setSceneList(qrcodeSceneDtos);
+            }
+        }
+    }
+
     @Override
     public Map<Long, String> listMoFangScene() {
         List<MoFangSceneDto> list = bookDao.listMoFangScene();

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/MoFangBookDto.java → pcloud-service-book/src/main/java/com/pcloud/book/book/vo/MoFangBookDto.java

 /**
  *
  */
-package com.pcloud.book.book.dto;
+package com.pcloud.book.book.vo;
 
+import com.pcloud.channelcenter.qrcode.dto.QrcodeSceneDto;
 import com.pcloud.common.dto.BaseDto;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 魔方书刊
  */
@@ -39,4 +42,9 @@ public class MoFangBookDto extends BaseDto {
      * 封面图
      */
     private String coverImg;
+
+    /**
+     * rays码列表
+     */
+    private List<QrcodeSceneDto> sceneList;
 }

pcloud-service-book/src/main/java/com/pcloud/book/consumer/user/ChannelConsr.java

@@ -423,4 +423,21 @@ public class ChannelConsr {
 		return biliVideoDTOMap;
 
     }
+
+	/**
+	 * 获取书刊下的rays码列表
+	 */
+	public Map<Long, List<QrcodeSceneDto>> listRaysCode(List<Long> bookIds) throws BizException {
+		if (ListUtils.isEmpty(bookIds)) {
+			return new HashMap<>();
+		}
+		Map<Long, List<QrcodeSceneDto>> result = new HashMap<>();
+		try {
+			result = ResponseHandleUtil.parseMapList(qrcodeSceneService.listRaysCode(bookIds), Long.class,
+					QrcodeSceneDto.class);
+		} catch (Exception e) {
+			LOGGER.error("【渠道用户(消)】获取书刊下的rays码列表,<ERROR>.[getNamesByIdList]:" + e.getMessage(), e);
+		}
+		return result;
+	}
 }

pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml

@@ -3439,7 +3439,7 @@
 	LAST_MODIFIED_DATE DESC
 	</select>
 
-	<select id="listMoFangBook" parameterType="map" resultType="com.pcloud.book.book.dto.MoFangBookDto">
+	<select id="listMoFangBook" parameterType="map" resultType="com.pcloud.book.book.vo.MoFangBookDto">
 		select
 		book_id bookId,
 		resource_count resourceCount,