Merge branch 'feature/1005004' into 'master'

feat:[1005009]授权码校验

See merge request rays/pcloud-book!1353

pcloud-service-book/src/main/java/com/pcloud/book/consumer/reader/ReaderConsr.java

@@ -8,6 +8,7 @@ import com.pcloud.readercenter.applet.entity.AppletQuestion;
 import com.pcloud.readercenter.applet.service.AppletUserService;
 import com.pcloud.readercenter.rmall.entity.RmallBookMoneyRecord;
 import com.pcloud.readercenter.rmall.service.RmallBookMoneyRecordService;
+import com.pcloud.readercenter.unionuser.service.RaysUnionUserService;
 import com.pcloud.readercenter.userlabel.dto.UserGradeLabelIdDTO;
 import com.pcloud.readercenter.userlabel.service.UserLabelService;
 import com.pcloud.readercenter.wechat.dto.NickNameAndOpenIdDto;
@@ -68,6 +69,8 @@ public class ReaderConsr {
     private AppletUserService appletUserService;
     @Autowired
     private UserLabelService userLabelService;
+    @Autowired
+    private RaysUnionUserService raysUnionUserService;
 
     public WechatUser getWechatUser(Long wechatUserId) throws BizException {
         if (wechatUserId == null) {
@@ -450,6 +453,16 @@ public class ReaderConsr {
             LOGGER.error("appletUserService.updateUserClassify"+e.getMessage(), e);
         }
     }
+
+    public List<Long> getAllUnionUser(Long wechatUserId) {
+        try {
+            return ResponseHandleUtil.parseList(raysUnionUserService.getAllUnionUser(wechatUserId), Long.class);
+
+        } catch (Exception e) {
+            LOGGER.error("调用raysUnionUserService.getAllUnionUser失败"+e.getMessage(), e);
+        }
+        return Arrays.asList(wechatUserId);
+    }
 }
 
 

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

@@ -177,7 +177,8 @@ public class BookAuthUserBizImpl implements BookAuthUserBiz {
     @Override
     @ParamLog("校验用户是否已经授权")
     public Boolean checkIsHaveAuth(Long bookId, Long channelId, Long adviserId, Long wechatUserId, Integer authBookType) {
-        return bookAuthUserDao.getIsHaveAuth(bookId, channelId, adviserId, wechatUserId, authBookType);
+        List<Long> wechatUserIdList = readerConsr.getAllUnionUser(wechatUserId);
+        return bookAuthUserDao.getIsHaveAuth(bookId, channelId, adviserId, wechatUserIdList, authBookType);
     }
 
     @Override

pcloud-service-book/src/main/java/com/pcloud/book/copyright/dao/BookAuthUserDao.java

@@ -36,7 +36,7 @@ public interface BookAuthUserDao extends BaseDao<BookAuthUser> {
     /**
      * 校验是否已经授权
      */
-    Boolean getIsHaveAuth(Long bookId, Long channelId, Long adviserId, Long wechatUserId, Integer authBookType);
+    Boolean getIsHaveAuth(Long bookId, Long channelId, Long adviserId, List<Long> wechatUserIdList, Integer authBookType);
 
     /**
      * 根据月份获取授权用户信息

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

@@ -51,12 +51,12 @@ public class BookAuthUserDaoImpl extends BaseDaoImpl<BookAuthUser> implements Bo
     }
 
     @Override
-    public Boolean getIsHaveAuth(Long bookId, Long channelId, Long adviserId, Long wechatUserId, Integer authBookType) {
+    public Boolean getIsHaveAuth(Long bookId, Long channelId, Long adviserId, List<Long> wechatUserIdList, Integer authBookType) {
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("bookId", bookId);
         paramMap.put("channelId", channelId);
         paramMap.put("adviserId",adviserId);
-        paramMap.put("wechatUserId",wechatUserId);
+        paramMap.put("wechatUserIdList",wechatUserIdList);
         if(authBookType == null || authBookType.equals(0)) {
             paramMap.put("isPaperBook", 1);
         } else {

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

@@ -62,7 +62,10 @@
 		AND
 			ADVISER_ID = #{adviserId, jdbcType=BIGINT}
 		AND
-			WECHAT_USER_ID = #{wechatUserId}
+			WECHAT_USER_ID in
+		<foreach collection="wechatUserIdList" open="(" close=")" item="item" separator="," index="index">
+			#{item}
+		</foreach>
 		<if test="isPaperBook != null">
 			AND
 			is_paper_book = #{isPaperBook}