From 2ec42a5aacea35d2918f0e17f07685cf5b4d25c8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:20:41 +0800
Subject: [PATCH] 包名引用路径更改

---
 fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java |   77 ++++++++++++++++++++++++++++++++------
 1 files changed, 64 insertions(+), 13 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 4742dc8..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,10 +23,10 @@
 	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;
 
@@ -34,6 +34,10 @@
 	@Expose
 	@Column(name = "cog_goods_id")
 	private String goodsId;
+
+	// 鍟嗗搧鐨勭被鍨�
+	@Column(name = "cog_goods_type")
+	private Integer goodsType;// 绛夊悓浜嶤ommonOrder鐨剆ourceType
 
 	// 鏍囬(鍙樺寲鏃舵柊寤�)
 	@Expose
@@ -50,16 +54,20 @@
 	@Column(name = "cog_price")
 	private BigDecimal price;
 
+	//瀹為檯浠锋牸
+	@Column(name = "cog_actual_price")
+	private BigDecimal actualPrice;
+
 	// 搴楅摵id
 	@Expose
 	@Column(name = "cog_shop_id")
 	private Long shopId;
-	
+
 	// 搴楅摵鍚嶇О
 	@Expose
 	@Column(name = "cog_shop_name")
 	private String shopName;
-	
+
 	// 搴楅摵鐨勭被鍨�
 	@Expose
 	@Column(name = "cog_shop_type")
@@ -73,20 +81,23 @@
 	// 鍒涘缓鏃堕棿
 	@Column(name = "cog_create_time")
 	private Date createTime;
-	
+
 	// 鏇存柊鏃堕棿
 	@Column(name = "cog_update_time")
 	private Date updateTime;
-	
 
-	public CommonOrderGoods(){
-		
+	// 鍒嗙被
+	private String category1;
+	private String category2;
+	private String category3;
+	
+	public CommonOrderGoods() {
+
 	}
-			
-	public CommonOrderGoods(Long id){
+
+	public CommonOrderGoods(Long id) {
 		this.id = id;
 	}
-	
 
 	public Long getId() {
 		return id;
@@ -94,6 +105,14 @@
 
 	public void setId(Long id) {
 		this.id = id;
+	}
+
+	public Integer getGoodsType() {
+		return goodsType;
+	}
+
+	public void setGoodsType(Integer goodsType) {
+		this.goodsType = goodsType;
 	}
 
 	public String getGoodsId() {
@@ -176,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