From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java
index 756805e..7552f75 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java
@@ -23,9 +23,9 @@
private static final long serialVersionUID = 1L;
// 娣樺疂
- public final static int TYPE_TAOBAO = 1;
- // 浜笢
- public final static int TYPE_JINGDONG = 2;
+ public final static String TYPE_TAOBAO = "TB";
+ // 澶╃尗
+ public final static String TYPE_TMALL = "TM";
@Column(name = "cog_id")
private Long id;
@@ -53,6 +53,10 @@
@Expose
@Column(name = "cog_price")
private BigDecimal price;
+
+ //瀹為檯浠锋牸
+ @Column(name = "cog_actual_price")
+ private BigDecimal actualPrice;
// 搴楅摵id
@Expose
@@ -82,6 +86,11 @@
@Column(name = "cog_update_time")
private Date updateTime;
+ // 鍒嗙被
+ private String category1;
+ private String category2;
+ private String category3;
+
public CommonOrderGoods() {
}
@@ -186,4 +195,36 @@
this.updateTime = updateTime;
}
+ public BigDecimal getActualPrice() {
+ return actualPrice;
+ }
+
+ public void setActualPrice(BigDecimal actualPrice) {
+ this.actualPrice = actualPrice;
+ }
+
+ public String getCategory1() {
+ return category1;
+ }
+
+ public void setCategory1(String category1) {
+ this.category1 = category1;
+ }
+
+ public String getCategory2() {
+ return category2;
+ }
+
+ public void setCategory2(String category2) {
+ this.category2 = category2;
+ }
+
+ public String getCategory3() {
+ return category3;
+ }
+
+ public void setCategory3(String category3) {
+ this.category3 = category3;
+ }
+
}
--
Gitblit v1.8.0