flow

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
@@ -21,14 +22,14 @@ import lombok.Data;
  */
 @Data
 @TableName("buy_order_detail")
-public class BuyOrderDetailEntity implements Serializable {
+public class BuyOrderDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
     /**
      * 订单详情id
      */
     @TableId
-    private Long allOrderId;
+    private Long id;
     /**
      * 订单表id
      */
@@ -56,15 +57,11 @@ public class BuyOrderDetailEntity implements Serializable {
     /**
      * 商品重量
      */
-    private Double weight;
+    private BigDecimal weight;
     /**
      * 商品类型
      */
     private String productType;
-    /**
-     * 物流单号
-     */
-    private String shippingSn;
     /**
      * 订单状态  0-待支付  1-待发货 2-待收货
      */
@@ -81,28 +78,12 @@ public class BuyOrderDetailEntity implements Serializable {
     /**
      * 图片
      */
-    @TableField(exist =  false)
+    @TableField(exist = false)
     private String image;
-    /**
-     * 地址id
-     */
-    private Integer addressId;
     /**
      * 面单html
      */
-    private String fmsHtml;
-    /**
-     * 快递公司编码
-     */
-    private String shipperCode;
-    /**
-     * 快递公司名称
-     */
-    private String shipperName;
-    /**
-     * 是否已打印 0: 未打印，1：已打印
-     */
-    private String isPrint;
+    private String expressBill;
     /**
      * 商品图片地址
      */
@@ -110,10 +91,9 @@ public class BuyOrderDetailEntity implements Serializable {
     /**
      * 评价 ID
      */
-    @TableField("record_id")
-    private  Integer recordId;
-
-    @TableField(exist = false)
-    private Long timestamp;
-
+    private Integer recordId;
+    /**
+     * 快递订单 ID
+     */
+    private String expressOrderId;
 }

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

@@ -125,7 +125,7 @@ public class BuyOrderEntity implements Serializable {
     private Integer delFlag;
 
     @TableField(exist = false)
-    private List<BuyOrderDetailEntity> products;
+    private List<BuyOrderDetail> products;
 
     @TableField(exist = false)
     private String buyType;

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

@@ -30,7 +30,7 @@ public class ExpressOrder {
     /**
      * 订单号
      */
-    private String orderId;
+    private Integer orderId;
     /**
      * 快递公司代码
      */

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

@@ -45,7 +45,7 @@ public class ShopProductEntity implements Serializable {
     /**
      * 商品重量
      */
-    private int weight;
+    private Integer weight;
     /**
      * 上架状态
      */