Merge branch 'feat-zyj-1002869' into 'master'

1002869展示书刊isbn

See merge request rays/pcloud-book!702

pcloud-service-book/src/main/java/com/pcloud/book/applet/dto/AppletGroupSearchRecordDTO.java

@@ -57,4 +57,6 @@ public class AppletGroupSearchRecordDTO implements Serializable {
     @ApiModelProperty("群分类信息")
     private List<ListClassify4WechatVO> classify4WechatVOList;
 
+    @ApiModelProperty("isbn")
+    private String isbn;
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/applet/dto/AppletUserBookcaseDTO.java

@@ -54,4 +54,7 @@ public class AppletUserBookcaseDTO extends BaseDto {
     private Integer joinGroupType;
 
     private Integer classifyId;
+
+    @ApiModelProperty("isbn")
+    private String isbn;
 }

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

@@ -36,7 +36,8 @@
             d.AUTHOR author,
             d.PUBLISH publish,
             d.REMARK remark,
-            d.COVER_IMG coverImg
+            d.COVER_IMG coverImg,
+            d.ISBN isbn
         FROM applet_group_search_record a
             INNER JOIN BOOK d ON a.BOOK_ID = d.BOOK_ID
         WHERE 1=1

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

@@ -35,7 +35,8 @@
 		b.PUBLISH publish,
 		a.SECOND_TEMPLET_ID secondTempletId,
 		a.TEMPLET_ID templetId,
-		d.join_group_type joinGroupType
+		d.join_group_type joinGroupType,
+		b.ISBN isbn
     FROM applet_user_bookcase c
     LEFT JOIN BOOK_ADVISER a ON c.book_id=a.BOOK_ID AND c.adviser_id=a.ADVISER_ID
     AND c.channel_id=a.CHANNEL_ID AND a.IS_DELETE = 0

pcloud-service-book/src/main/resources/mapper/cultivate/CultivateRecord.xml

@@ -119,7 +119,7 @@
 
     <select id="getBookSearchRecord" parameterType="map" resultType="com.pcloud.book.book.vo.SearchBookVO">
         select a.id,a.content,a.book_id bookId ,b.book_name bookName,a.agent_id agentId,c.SECOND_TEMPLET_ID secondTempletId,b.publish ,c.ADVISER_ID adviserId,c.channel_id channelId
-        ,a.create_time createTime,b.author,b.COVER_IMG coverImg
+        ,a.create_time createTime,b.author,b.COVER_IMG coverImg, b.ISBN isbn
         from search_record a,book b ,book_adviser c
         where a.book_id=b.book_id
         and a.book_id=c.book_id