From 55b3bd7821f14db9e9441d8b34fb9bdc1a9e4df7 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期六, 14 三月 2020 11:11:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java | 17 ++++++++++++++---
1 files changed, 14 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..191b0b7 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,9 @@
@Expose
@Column(name = "cog_price")
private BigDecimal price;
+
+ @Column(name = "cog_actual_price")
+ private BigDecimal actualPrice;
// 搴楅摵id
@Expose
@@ -186,4 +189,12 @@
this.updateTime = updateTime;
}
+ public BigDecimal getActualPrice() {
+ return actualPrice;
+ }
+
+ public void setActualPrice(BigDecimal actualPrice) {
+ this.actualPrice = actualPrice;
+ }
+
}
--
Gitblit v1.8.0