Merge branch 'feature/1004645' into 'master'

feat: [1004645] 书刊二维码目录（分码与总码）优化

See merge request rays/pcloud-book!1273

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java

@@ -803,6 +803,18 @@ public class BookDto extends BaseDto {
      * 排序值
      */
     private Integer seq;
+    /**
+     * 是否有书籍目录开启权限
+     */
+    private Boolean openCatalogPermission;
+
+    public Boolean getOpenCatalogPermission() {
+        return openCatalogPermission;
+    }
+
+    public void setOpenCatalogPermission(Boolean openCatalogPermission) {
+        this.openCatalogPermission = openCatalogPermission;
+    }
 
     public Integer getSeq() {
         return seq;
@@ -2418,6 +2430,7 @@ public class BookDto extends BaseDto {
                 ", bookGmv=" + bookGmv +
                 ", isOpenCatalog=" + isOpenCatalog +
                 ", seq=" + seq +
+                ", openCatalogPermission=" + openCatalogPermission +
                 ", bookAdviserDto=" + bookAdviserDto +
                 '}';
     }

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

@@ -988,6 +988,8 @@ public class BookBizImpl implements BookBiz {
         bookSet.setQrInfo(pageBean.getRecordList());
         //社群书相关信息
         bookSet.setBookGroupInfo(pageBean.getRecordList());
+        //设置书刊资源目录按钮展示
+        bookSet.setBookCatalogInfo(pageBean.getRecordList(), adviserId);
         return pageBean;
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/book/set/BookSet.java

@@ -60,6 +60,7 @@ import com.pcloud.book.group.dto.BookGroupDTO;
 import com.pcloud.book.group.dto.BookGroupStatisticDTO;
 import com.pcloud.book.util.common.ThreadPoolUtils;
 import com.pcloud.channelcenter.base.constants.MessageFromTypeEnum;
+import com.pcloud.channelcenter.qrcode.dto.Book4CatalogDTO;
 import com.pcloud.channelcenter.qrcode.dto.QrcodeLocationDto;
 import com.pcloud.channelcenter.qrcode.dto.QrcodeSceneDto;
 import com.pcloud.channelcenter.qrcode.vo.BookAssocLastQrAskVO;
@@ -189,6 +190,7 @@ public class BookSet {
     private LabelService labelService;
     @Autowired
     private BookLabelDao bookLabelDao;
+    private List<Object> bookCatalogInfo;
 
     /**
      * 检验书号是否合法，包括ISSN,ISBN,CSSN
@@ -1575,6 +1577,7 @@ public class BookSet {
 
     /**
      * 设置图书是否关联二维码和个数
+     *
      * @param recordList (List<BookDto>)
      * @param adviserId  编辑标识
      */
@@ -1990,4 +1993,24 @@ public class BookSet {
             }
         });
     }
+
+    /**
+     * 设置书刊资源目录按钮展示
+     */
+    public void setBookCatalogInfo(List<Object> recordList, Long adviserId) {
+        List<Long> bookIds = BookTools.listBookIds(recordList);
+        Map<String, Book4CatalogDTO> catalogDTOMap = channelConsr.mapCatalogBook(bookIds, adviserId);
+        for (Object obj : recordList) {
+            BookDto bookDto = (BookDto) obj;
+            Boolean openCatalogPermission = false;
+            if (null != bookDto) {
+                String key = bookDto.getBookId()+"-"+bookDto.getChannelId()+"-"+bookDto.getAdviserId();
+                if (!MapUtils.isEmpty(catalogDTOMap) && catalogDTOMap.containsKey(key)) {
+                    openCatalogPermission = true;
+                }
+            }
+            bookDto.setOpenCatalogPermission(openCatalogPermission);
+        }
+        LOGGER.info("设置书刊资源目录按钮展示【END】");
+    }
 }

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

@@ -7,6 +7,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.pcloud.channelcenter.base.exceptions.ChannelBizException;
 import com.pcloud.channelcenter.qrcode.dto.AdviserQrcodeSceneDTO;
+import com.pcloud.channelcenter.qrcode.dto.Book4CatalogDTO;
 import com.pcloud.channelcenter.qrcode.dto.MapResourceCountDTO;
 import com.pcloud.channelcenter.qrcode.dto.QrcodeMessageDTO;
 import com.pcloud.channelcenter.qrcode.dto.QrcodeSceneDto;
@@ -326,4 +327,17 @@ public class ChannelConsr {
 			return new ArrayList<>();
 		}
 	}
+
+	@ParamLog("批量查可以开启资源目录按钮的书刊")
+    public Map<String,Book4CatalogDTO> mapCatalogBook(List<Long> bookIds, Long adviserId) {
+		if (ListUtils.isEmpty(bookIds) || null == adviserId) {
+			return new HashMap<>();
+		}
+		try {
+			return ResponseHandleUtil.parseMapResponse(qrcodeSceneService.mapCatalogBook(bookIds, adviserId), String.class, Book4CatalogDTO.class);
+		} catch (Exception e) {
+			LOGGER.error("批量查可以开启资源目录按钮的书刊[qrcodeSceneService.mapCatalogBook]失败" + e.getMessage(), e);
+		}
+		return new HashMap<>();
+    }
 }