Просмотр исходного кода

产品、订单服务表字段修改

yzc 2 лет назад
Родитель
Сommit
64a96e4935

+ 1 - 1
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrder.java

@@ -25,7 +25,7 @@ public class KwoTradeOrder extends BaseModel {
     /**
      * 订单编号
      */
-    private String orderNo;
+    private String tOrderNo;
 
     /**
      * 货物数量

+ 2 - 2
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderAddress.java

@@ -22,12 +22,12 @@ public class KwoTradeOrderAddress extends BaseModel {
     /**
      * 交易订单id
      */
-    private Long orderId;
+    private Long tOrderId;
 
     /**
      * 订单编号
      */
-    private String orderNo;
+    private String tOrderNo;
 
     /**
      * 地址类型(1装货地址、2卸货地址)

+ 2 - 2
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderContract.java

@@ -27,11 +27,11 @@ public class KwoTradeOrderContract extends BaseModel {
     /**
      * 订单id(销售订单/采购订单)
      */
-    private Long orderId;
+    private Long tOrderId;
 
     /**
      * 订单编号(销售订单/采购订单)
      */
-    private String orderNo;
+    private String tOrderNo;
 
 }

+ 4 - 4
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderGoods.java

@@ -24,12 +24,12 @@ public class KwoTradeOrderGoods extends BaseModel {
     /**
      * 交易订单id
      */
-    private Long orderId;
+    private Long tOrderId;
 
     /**
      * 订单编号
      */
-    private String orderNo;
+    private String tOrderNo;
 
     /**
      * 商品id
@@ -52,8 +52,8 @@ public class KwoTradeOrderGoods extends BaseModel {
     private String unit;
 
     /**
-     * 价格
+     * kwp_goods_price_range表主键ID
      */
-    private BigDecimal price;
+    private Long priceRangeId;
 
 }

+ 2 - 5
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderTrack.java

@@ -2,14 +2,11 @@ package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
-import java.math.BigDecimal;
-
 /**
  * @desc: 交易订单状态记录信息
  * @author: yzc
@@ -25,11 +22,11 @@ public class KwoTradeOrderTrack extends BaseModel {
     /**
      * 交易订单id
      */
-    private Long orderId;
+    private Long tOrderId;
 
     /**
      * 订单编号
      */
-    private String orderNo;
+    private String tOrderNo;
 
 }

+ 2 - 3
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderUnit.java

@@ -2,7 +2,6 @@ package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -23,12 +22,12 @@ public class KwoTradeOrderUnit extends BaseModel {
     /**
      * 交易订单id
      */
-    private Long orderId;
+    private Long tOrderId;
 
     /**
      * 订单编号
      */
-    private String orderNo;
+    private String tOrderNo;
 
     /**
      * 单位类型(1销售单位、2采购单位)

+ 10 - 0
sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoods.java

@@ -86,4 +86,14 @@ public class KwpGoods extends BaseModel {
      */
     private Long manager;
 
+    /**
+     * 成交量
+     */
+    private BigDecimal performedAmount;
+
+    /**
+     * 缩略图
+     */
+    private String image;
+
 }

+ 5 - 0
sckw-modules/sckw-product/src/main/java/com/sckw/product/model/KwpGoodsPriceRange.java

@@ -41,4 +41,9 @@ public class KwpGoodsPriceRange extends BaseModel {
      */
     private BigDecimal price;
 
+    /**
+     * 序号
+     */
+    private Integer sort;
+
 }