--9.18

src/main/java/com/peanut/modules/book/entity/BookEntity.java

@@ -156,7 +156,12 @@ public class BookEntity implements Serializable {
 	private Integer chapterNum;
 
 	@TableField(exist = false)
-	private Integer isBuy;
+	private Boolean isBuy;
+
+
+
+//	@TableField(exist = false)
+//	private Boolean bookAuthen;
 
 
 	@TableField("can_listen")

src/main/java/com/peanut/modules/book/entity/OrderCartEntity.java

@@ -32,6 +32,10 @@ public class OrderCartEntity implements Serializable {
 	 * 商品id
 	 */
 	private Integer productId;
+	/**
+	 * 套装参数
+	 */
+	private Integer proudictBook;
 	/**
 	 * 商品数量
 	 */

src/main/java/com/peanut/modules/book/entity/ShopProductEntity.java

@@ -37,7 +37,7 @@ public class ShopProductEntity implements Serializable {
 	 */
 	private BigDecimal price;
 	/**
-	 * 商品价格
+	 * 商品活动价格
 	 */
 	private BigDecimal activityPrice;
 	/**
@@ -151,10 +151,14 @@ public class ShopProductEntity implements Serializable {
 	private ArrayList<String> bookids;
 
 	/**
-	 * 多个电子书Id
+	 * 多个电子书Id  ArrayList<Map<String,String>>
 	 */
 	@TableField(exist =  false)
-	private ArrayList<Map<String,String>> bookidsimages;
+	private  List<Object> bookidsimages;
+
+
+	@TableField(exist =  false)
+	private List<Object> shoproudBook;
 
 
 //	private Object bookidsimages;

src/main/java/com/peanut/modules/book/entity/ShopProudictBookEntity.java

@@ -0,0 +1,45 @@
+package com.peanut.modules.book.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+
+@Data
+@TableName("shop_proudict_book")
+public class ShopProudictBookEntity {
+
+    @TableId
+    private  Integer id;
+    /**
+     *  商品id
+     */
+    @TableField("proudict_id")
+    private  Integer proudictId;
+    /**
+     *图书id
+     */
+    @TableField("book_id")
+    private Integer bookId;
+    /**
+     * 多个图书id (备用)
+     */
+    @TableField("book_ids")
+    private Integer bookdIds;
+
+
+    @TableField("del_flag")
+    @TableLogic
+    private  Integer delFlag;
+
+    /**
+     * 创建日期
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+
+    @TableField(exist =  false)
+    private ArrayList<Integer> bookidlist;
+}

src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java

@@ -34,6 +34,9 @@ public class UserRecordEntity {
     //快递单号
     @TableField("orderCode")
     private String  orderCode;
+
+    @TableField("proudict_id")
+    private Integer  proudictId;
     //订单号
     @TableField("orderSn")
     private String orderSn;
@@ -72,4 +75,10 @@ public class UserRecordEntity {
     private  Integer orderdid;
 
 
+    @TableField(exist = false)
+    private  Object avatar;
+
+    @TableField(exist = false)
+    private  Object nickname;
+
 }