Merge branch 'fixbug/1026119' into 'master'

bug: [1026119] 【中教图馆配书的配置流程修改方案】现代纸书的馆配书，进入小程序没有跳出馆配书

See merge request rays/pcloud-book!1015

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

 package com.pcloud.book.applet.biz.impl;
 
 import com.google.common.collect.Lists;
-import com.google.gson.internal.$Gson$Preconditions;
 import com.pcloud.appcenter.assist.dto.AssistTempletDTO;
 import com.pcloud.book.applet.biz.AppletNewsBiz;
 import com.pcloud.book.applet.biz.AppletUserBookcaseBiz;
@@ -19,16 +18,15 @@ import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.book.biz.BookAdviserBiz;
 import com.pcloud.book.book.biz.BookBiz;
 import com.pcloud.book.book.constant.BookConstant;
+import com.pcloud.book.book.dao.BookDao;
 import com.pcloud.book.book.dao.BookRaysClassifyDao;
 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.user.AdviserConsr;
-import com.pcloud.book.consumer.user.AgentConsr;
 import com.pcloud.book.copyright.tools.ExcelUtil;
 import com.pcloud.book.es.biz.ESBookAndAdviserBiz;
 import com.pcloud.book.group.biz.BookGroupBiz;
-import com.pcloud.book.group.dto.BookGroupDTO;
 import com.pcloud.book.group.dto.BookServeDTO;
 import com.pcloud.book.group.enums.AppAndProductTypeEnum;
 import com.pcloud.book.group.enums.JoinGroupTypeEnum;
@@ -52,7 +50,6 @@ import com.pcloud.common.utils.DateUtils;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.string.StringUtil;
-
 import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
@@ -111,6 +108,8 @@ public class AppletUserBookcaseBizImpl implements AppletUserBookcaseBiz {
     private BookBiz bookBiz;
     @Autowired
     private AdviserConsr adviserConsr;
+    @Autowired
+    private BookDao bookDao;
 
     @Override
     public void addUserBook(AppletUserBookcase appletUserBookcase) {
@@ -292,11 +291,17 @@ public class AppletUserBookcaseBizImpl implements AppletUserBookcaseBiz {
             throw new BookBizException(BookBizException.PARAM_IS_ERROR, "参数有误！");
         }
         UserLastBookReDTO lastBookRe;
-        //查询最后一本社群书
-        lastBookRe = appletUserBookcaseDao.getUserLastGroupBookRe(wechatUserId);
+        // 首先判断是否是馆配图书
+        lastBookRe = appletUserBookcaseDao.getUserLastGroupBook(wechatUserId);
+        if (Objects.nonNull(lastBookRe) && bookBiz.checkIsLibraryBook(lastBookRe.getAdviserId(), lastBookRe.getBookId())) {
+            // 查询是否是社群书
+            lastBookRe.setBookGroup(bookDao.checkIsGroupBook(lastBookRe.getBookId()) > 0);
+        } else {
+            //查询最后一本社群书
+            lastBookRe = appletUserBookcaseDao.getUserLastGroupBookRe(wechatUserId);
+        }
         if (lastBookRe != null) {
             lastBookRe.setHasBook(true);
-            lastBookRe.setBookGroup(true);
             RightsSettingDto rightsSettingDto = rightsSettingBiz.getRightsSettingByBookId4AppletHome(lastBookRe.getBookId(), lastBookRe.getAdviserId(), lastBookRe.getChannelId());
             if (rightsSettingDto != null) {
                 lastBookRe.setRightSettingId(rightsSettingDto.getId());

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

@@ -105,4 +105,6 @@ public interface AppletUserBookcaseDao extends BaseDao<AppletUserBookcase> {
     BaseTempletClassify getBookClassifyInfo(Long bookId, Long channelId, Long adviserId);
 
     BaseTempletClassify getLastReadBookInfo(Long wechatUserId);
+
+    UserLastBookReDTO getUserLastGroupBook(Long wechatUserId);
 }

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

@@ -148,4 +148,9 @@ public class AppletUserBookcaseDaoImpl extends BaseDaoImpl<AppletUserBookcase> i
         map.put("wechatUserId", wechatUserId);
         return getSessionTemplate().selectOne(getStatement("getLastReadBookInfo"),map);
     }
+
+    @Override
+    public UserLastBookReDTO getUserLastGroupBook(Long wechatUserId) {
+        return getSessionTemplate().selectOne(getStatement("getUserLastGroupBook"),wechatUserId);
+    }
 }

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

@@ -3232,11 +3232,11 @@ public class BookBizImpl implements BookBiz {
 
     @Override
     public Boolean checkIsLibraryBook(Long adviserId, Long bookId) {
-        if ("pro".equals(envStr) && Objects.equals(adviserId, 1000019217L)) {
+        if ("pro".equals(envStr) && Objects.equals(adviserId, 1000027204L)) {
             return Boolean.TRUE;
         } else if ("uat".equalsIgnoreCase(envStr) && Objects.equals(bookId, 1398300L)) {
             return Boolean.TRUE;
-        } else if ("test".equalsIgnoreCase(envStr) && Objects.equals(bookId, 5210593L)) {
+        } else if ("test".equalsIgnoreCase(envStr) && Objects.equals(bookId, 5210703L)) {
             return Boolean.TRUE;
         }
         return Boolean.FALSE;

pcloud-service-book/src/main/java/com/pcloud/book/book/dao/BookDao.java

@@ -358,4 +358,6 @@ public interface BookDao extends BaseDao<Book> {
     void relateUniqueNumber4Erp(List<BookUniqueNumberDTO> bookUniqueNumberVos);
 
 	void updateByPrimaryKeySelective(Book book);
+
+	Integer checkIsGroupBook(Long bookId);
 }

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

@@ -3,6 +3,7 @@
  */
 package com.pcloud.book.book.dao.impl;
 
+import cn.hutool.core.map.MapUtil;
 import com.google.common.collect.Maps;
 import com.pcloud.book.book.dao.BookDao;
 import com.pcloud.book.book.dto.AdviserBookInfoDTO;
@@ -404,4 +405,9 @@ public class BookDaoImpl extends BaseDaoImpl<Book> implements BookDao {
     public void updateByPrimaryKeySelective(Book book){
         super.getSqlSession().update(getStatement("updateByPrimaryKeySelective"), book);
     }
+
+    @Override
+    public Integer checkIsGroupBook(Long bookId) {
+        return getSqlSession().selectOne(getStatement("checkIsGroupBook"), MapUtil.of("bookId", bookId));
+    }
 }

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

@@ -133,7 +133,8 @@
             t.book_id bookId,
             t.adviser_id adviserId,
             t.channel_id channelId,
-            t.read_type readType
+            t.read_type readType,
+            1 bookGroup
         FROM
             applet_user_bookcase t
         INNER JOIN book_group t1 ON t.book_id = t1.book_id
@@ -324,4 +325,21 @@
         LIMIT 1
     </select>
 
+    <select id="getUserLastGroupBook" parameterType="long" resultType="com.pcloud.book.applet.dto.UserLastBookReDTO">
+       SELECT
+            book_id bookId,
+            adviser_id adviserId,
+            channel_id channelId,
+            read_type readType
+        FROM
+            applet_user_bookcase
+        WHERE
+            channel_id >= 1
+        AND adviser_id >= 1
+        AND wechat_user_id = #{wechatUserId}
+        ORDER BY
+            create_time DESC
+        LIMIT 1
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -2538,4 +2538,14 @@
 	<select id="listBookId" resultType="long">
 		select BOOK_ID from book
 	</select>
+
+	<select id="checkIsGroupBook" parameterType="Long" resultType="Integer">
+		  SELECT
+	      ifnull(count(1),0)
+          FROM
+	      book_group
+          WHERE
+	      book_id = #{bookId}
+          AND is_delete = 0
+	</select>
 </mapper>