Merge branch 'feature/1007278' into 'release'

feat: [1007278] 斗罗大陆书刊（3本）需求支持-先支持2本不涉及前端

See merge request rays/pcloud-book!1590

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

@@ -26,6 +26,7 @@ import com.pcloud.book.book.entity.BookLabel;
 import com.pcloud.book.book.entity.BookRaysClassify;
 import com.pcloud.book.consumer.app.AssistTempletConsr;
 import com.pcloud.book.consumer.common.ExportConsr;
+import com.pcloud.book.consumer.function.FunctionConsr;
 import com.pcloud.book.consumer.reader.ReaderConsr;
 import com.pcloud.book.consumer.user.AdviserConsr;
 import com.pcloud.book.copyright.tools.ExcelUtil;
@@ -123,6 +124,8 @@ public class AppletUserBookcaseBizImpl implements AppletUserBookcaseBiz {
     private ReaderConsr readerConsr;
     @Autowired
     private ResourcePageBiz resourcePageBiz;
+    @Autowired
+    private FunctionConsr functionConsr;
 
     @Override
     @ParamLog("小程序用户添加书架")
@@ -430,7 +433,8 @@ public class AppletUserBookcaseBizImpl implements AppletUserBookcaseBiz {
         } else if ("test".equalsIgnoreCase(BookProps.getSystemEnv())) {
             bookId = 5210703L;
         }
-        lastBookRe = appletUserBookcaseDao.getUserLastRe(wechatUserIdList, adviserId, bookId);
+        List<Long> allDlBookIds = functionConsr.getAllDlBookId();
+        lastBookRe = appletUserBookcaseDao.getUserLastRe(wechatUserIdList, adviserId, bookId,allDlBookIds);
         if (Objects.nonNull(lastBookRe)) {
             lastBookRe.setHasBook(true);
             //判断是否是馆配图书

pcloud-service-book/src/main/java/com/pcloud/book/applet/dao/AppletUserBookcaseDao.java

@@ -56,7 +56,7 @@ public interface AppletUserBookcaseDao extends BaseDao<AppletUserBookcase> {
      * @date：2021/6/3 9:32
      *  * @param null
      */
-    UserLastBookReDTO getUserLastRe(List<Long> wechatUserIdList, Long adviserId, Long bookId);
+    UserLastBookReDTO getUserLastRe(List<Long> wechatUserIdList, Long adviserId, Long bookId, List<Long> allDlBookIds);
 
     /**
      * 批量删除

pcloud-service-book/src/main/java/com/pcloud/book/applet/dao/impl/AppletUserBookcaseDaoImpl.java

@@ -63,11 +63,12 @@ public class AppletUserBookcaseDaoImpl extends BaseDaoImpl<AppletUserBookcase> i
     }
 
     @Override
-    public UserLastBookReDTO getUserLastRe(List<Long> wechatUserIdList, Long adviserId, Long bookId) {
+    public UserLastBookReDTO getUserLastRe(List<Long> wechatUserIdList, Long adviserId, Long bookId, List<Long> allDlBookIds) {
         Map<String,Object>map = new HashMap<>();
         map.put("wechatUserIdList", wechatUserIdList);
         map.put("adviserId", adviserId);
         map.put("bookId", bookId);
+        map.put("allDlBookIds", allDlBookIds);
         return getSessionTemplate().selectOne(getStatement("getUserLastRe"), map);
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/consumer/function/FunctionConsr.java

 package com.pcloud.book.consumer.function;
 
+import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.function.douluo.dto.AppTaskDTO;
+import com.pcloud.function.douluo.dto.DlBookDTO;
 import com.pcloud.function.douluo.service.DlAppTaskService;
 import com.pcloud.function.douluo.service.DlBookService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,5 +50,30 @@ public class FunctionConsr {
         }
         return appTaskList;
     }
+
+    public DlBookDTO getDlBookInfo(Long bookId) {
+        log.info("function.dlAppTaskService.getDlBookInfo()获取斗罗书信息");
+        DlBookDTO dlBookDTO = null;
+        if (null == bookId) {
+            return dlBookDTO;
+        }
+        try {
+            dlBookDTO = ResponseHandleUtil.parseResponse(dlBookService.getDlBookInfo(bookId), DlBookDTO.class);
+        } catch (Exception e) {
+            log.error("function.dlAppTaskService.getDlBookInfo()远程调用失败");
+        }
+        return dlBookDTO;
+    }
+
+    public List<Long> getAllDlBookId() {
+        log.info("function.dlAppTaskService.getAllDlBookId()获取所有斗罗书信息");
+        List<Long> allBookIds = new ArrayList<>();
+        try {
+            allBookIds = ResponseHandleUtil.parseListResponse( dlBookService.getAllDlBookId(), Long.class);
+        } catch (Exception e) {
+            log.error("function.dlAppTaskService.getAllDlBookId()远程调用失败");
+        }
+        return allBookIds;
+    }
 }
 

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

@@ -261,6 +261,7 @@ import com.pcloud.facade.tradecenter.dto.SpeWechatGroupDto;
 import com.pcloud.facade.tradecenter.dto.WechatGroupDto;
 import com.pcloud.facade.wechat.material.dto.GroupNewsMaterialAddDTO;
 import com.pcloud.facade.wechat.material.service.MaterialService;
+import com.pcloud.function.douluo.dto.DlBookDTO;
 import com.pcloud.labelcenter.label.service.LabelService;
 import com.pcloud.liveapp.live.dto.ProductIdSearchDto;
 import com.pcloud.liveapp.live.service.TimeTableService;
@@ -5740,8 +5741,14 @@ public class BookGroupBizImpl implements BookGroupBiz {
     }
 
     private void setDouLuoBOOK(Map<String, Object> map, Long bookId) {
-        Boolean isDlBook = functionConsr.checkIsDlBook(bookId);
-        map.put("isDouluo", null == isDlBook ? false : isDlBook);
+        DlBookDTO dlBookDTO = functionConsr.getDlBookInfo(bookId);
+        if (null != dlBookDTO) {
+            map.put("isDouluo", true);
+            map.put("pageType", dlBookDTO.getPageType());
+        } else {
+            map.put("isDouluo", false);
+        }
+
     }
 
     private void setTempletName(Map<String, Object> map, BookAdviserDto adviserDto) {

pcloud-service-book/src/main/resources/mapper/applet/AppletUserBookcase.xml

@@ -195,6 +195,12 @@
         <foreach collection="wechatUserIdList" separator="," item="item" close=")" open="(" index="index">
             #{item}
         </foreach>
+        <if test="allDlBookIds != null and allDlBookIds.size() != 0">
+            and t.book_id not in
+            <foreach collection="allDlBookIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         ORDER BY
             t.create_time DESC
         LIMIT 1