feat:[none]馆配

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.pcloud.appcenter.assist.dto.AssistTempletDTO;
 import com.pcloud.book.applet.biz.AppletUserBookcaseBiz;
 import com.pcloud.book.applet.contants.AppletConstants;
@@ -49,17 +50,17 @@ import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.readercenter.rmall.constants.RmallContants;
+import com.pcloud.readercenter.rmall.entity.RmallBookMoneyRecord;
 import com.pcloud.readercenter.rmall.enums.MoneyReceiveTypeEnum;
+import com.pcloud.readercenter.rmall.service.RmallBookMoneyRecordService;
 import com.pcloud.readercenter.userlabel.dto.UserGradeLabelIdDTO;
 import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
-import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
-import com.pcloud.readercenter.rmall.service.RmallBookMoneyRecordService;
-import com.pcloud.readercenter.rmall.entity.RmallBookMoneyRecord;
 
 import java.io.File;
 import java.io.IOException;
@@ -77,6 +78,8 @@ import java.util.Optional;
 import java.util.Random;
 import java.util.stream.Collectors;
 
+import lombok.extern.slf4j.Slf4j;
+
 import static com.pcloud.book.util.common.ThreadPoolUtils.RMALL_SIGN_IN;
 
 /**
@@ -407,8 +410,17 @@ public class AppletUserBookcaseBizImpl implements AppletUserBookcaseBiz {
         }
         List<Long> wechatUserIdList = readerConsr.getRelateUserIdList(wechatUserId, officialAccountsId);
         UserLastBookReDTO lastBookRe;
-        //查询最后开启小睿的一本书
-        lastBookRe = appletUserBookcaseDao.getUserLastRe(wechatUserIdList);
+        //查询最后开启小睿的一本书或者馆配书
+        Long bookId = null;
+        Long adviserId = null;
+        if ("pro".equals(BookProps.getSystemEnv())) {
+            adviserId = 1000027204L;
+        } else if ("uat".equalsIgnoreCase(BookProps.getSystemEnv())) {
+            bookId = 1398300L;
+        } else if ("test".equalsIgnoreCase(BookProps.getSystemEnv())) {
+            bookId = 5210703L;
+        }
+        lastBookRe = appletUserBookcaseDao.getUserLastRe(wechatUserIdList, adviserId, bookId);
         if (Objects.nonNull(lastBookRe)) {
             lastBookRe.setHasBook(true);
             //判断是否是馆配图书

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

@@ -49,7 +49,13 @@ public interface AppletUserBookcaseDao extends BaseDao<AppletUserBookcase> {
 
     UserLastBookReDTO getUserLastGroupBookRe(Long wechatUserId);
 
-    UserLastBookReDTO getUserLastRe(List<Long> wechatUserIdList);
+    /**
+     * 用户最后点击的小睿书或者馆配书
+     * @author：zhuyajie
+     * @date：2021/6/3 9:32
+     *  * @param null
+     */
+    UserLastBookReDTO getUserLastRe(List<Long> wechatUserIdList, Long adviserId, Long bookId);
 
     /**
      * 批量删除

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

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

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

@@ -168,7 +168,7 @@
         LIMIT 1
     </select>
 
-    <select id="getUserLastRe" parameterType="list" resultType="com.pcloud.book.applet.dto.UserLastBookReDTO" >
+    <select id="getUserLastRe" parameterType="map" resultType="com.pcloud.book.applet.dto.UserLastBookReDTO" >
         SELECT
             t.book_id bookId,
             t.adviser_id adviserId,
@@ -182,9 +182,17 @@
         WHERE
             t.channel_id >= 1
         AND t.adviser_id >= 1
-        AND p.open_rays = 1
+        AND (
+        p.open_rays = 1
+        <if test="bookId != null">
+            OR t.book_id = #{bookId}
+        </if>
+        <if test="adviserId != null">
+            OR t.adviser_id = #{adviserId}
+        </if>
+        )
         AND t.wechat_user_id IN
-        <foreach collection="list" separator="," item="item" close=")" open="(" index="index">
+        <foreach collection="wechatUserIdList" separator="," item="item" close=")" open="(" index="index">
             #{item}
         </foreach>
         ORDER BY