Merge branch 'feature/1003658-01' into 'master'

feat: [1003658] 答案向其它资源和权益引流bug

See merge request rays/pcloud-book!994

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookAdviserBiz.java

@@ -266,4 +266,6 @@ public interface BookAdviserBiz {
 	PageBeanNew<PcloudAdviserBookVO> listAdviserBook4Pcloud(String keyword, Integer currentPage, Integer numPerPage);
 
 	Map<String, BookAdviserDto> getBookInfoByBookIds(List<Long> bookIds, List<Long> adviserIds, List<Long> channelIds);
+
+	BookAdviserDto getBookByBookIdAdviserId(Long bookId, Long adviserId);
 }

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

@@ -1412,4 +1412,9 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
         return resultMap;
     }
 
+    @Override
+	public BookAdviserDto getBookByBookIdAdviserId(Long bookId, Long adviserId){
+		return bookAdviserDao.getBookByBookIdAdviserId(bookId,adviserId);
+	}
+
 }

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

@@ -287,4 +287,6 @@ public interface BookAdviserDao extends BaseDao<BookAdviser> {
     Integer getIsRui(Long adviserId, Long bookId, Long channelId);
 
 	List<BookAdviserDto> getBookInfoByBookIds(List<Long> bookIds, List<Long> adviserIds, List<Long> channelIds);
+
+    BookAdviserDto getBookByBookIdAdviserId(Long bookId, Long adviserId);
 }

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

@@ -308,4 +308,12 @@ public class BookAdviserDaoImpl extends BaseDaoImpl<BookAdviser> implements Book
 		paramMap.put("channelIds", channelIds);
 		return super.getSqlSession().selectList(this.getStatement("getBookInfoByBookIds"), paramMap);
 	}
+
+	@Override
+	public BookAdviserDto getBookByBookIdAdviserId(Long bookId, Long adviserId){
+		Map<String, Object> paramMap = new HashMap<>();
+		paramMap.put("bookId",bookId);
+		paramMap.put("adviserId", adviserId);
+		return super.getSqlSession().selectOne(this.getStatement("getBookByBookIdAdviserId"), paramMap);
+	}
 }

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

@@ -3081,6 +3081,14 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
         if (null == bookId || null == channelId || null == adviserId){
             return new ResourceList4Answer();
         }
+        BookAdviserDto bookAdviserDto = bookAdviserBiz.getBase(bookId,channelId,adviserId);
+        //处理答案应用运营平台和书刊运营平台不一致的情况
+        if (null == bookAdviserDto){
+            BookAdviserDto adviserDto = bookAdviserBiz.getBookByBookIdAdviserId(bookId, adviserId);
+            if (null != adviserDto){
+                channelId = adviserDto.getChannelId();
+            }
+        }
         ResourceList4Answer resourceList4Answer = new ResourceList4Answer();
         resourceList4Answer.setBookId(bookId);
         resourceList4Answer.setChannelId(channelId);

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

@@ -855,4 +855,18 @@
 		</foreach>
 	</select>
 
+
+	<select id="getBookByBookIdAdviserId" parameterType="map" resultMap="bookAdviserMap">
+		SELECT
+		BOOK_ADVISER_ID, BOOK_ID, TEMPLET_ID, CHANNEL_ID, ADVISER_ID, IS_DELETE,
+		TEMPLET_ID,SECOND_TEMPLET_ID,
+		GRA_LABEL_ID,SUB_LABEL_ID,VER_LABEL_ID,AREA_LABEL_ID,vol_label_id
+		FROM
+			book_adviser
+		WHERE
+			BOOK_ID = #{bookId}
+		AND ADVISER_ID = #{adviserId}
+		ORDER BY IS_MAIN_EDITOR DESC,IS_DELETE ASC
+		LIMIT 1
+	</select>
 </mapper>