From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java
index de63910..71b1630 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java
@@ -1,9 +1,7 @@
 package com.yeshi.fanli.entity.bus.user;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -12,9 +10,7 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
 import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 
@@ -37,6 +33,7 @@
 
 	public final static int ORDER_TYPE_TAOBAO = 1;// 娣樺疂
 	public final static int ORDER_TYPE_JINGDONG = 2;// 浜笢
+	public final static int ORDER_TYPE_PDD = 3;// 鎷煎澶�
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -120,10 +117,10 @@
 	@org.yeshi.utils.mybatis.Column(name = "version")
 	private Integer version;
 
-	@OneToMany(fetch = FetchType.EAGER)
-	@JoinTable(name = "yeshi_ec_order_item", joinColumns = { @JoinColumn(name = "oid") }, inverseJoinColumns = {
-			@JoinColumn(name = "id") })
-	private List<OrderItem> orderItemList = new ArrayList<OrderItem>();
+//	@OneToMany(fetch = FetchType.EAGER)
+//	@JoinTable(name = "yeshi_ec_order_item", joinColumns = { @JoinColumn(name = "oid") }, inverseJoinColumns = {
+//			@JoinColumn(name = "id") })
+//	private List<OrderItem> orderItemList = new ArrayList<OrderItem>();
 
 	public Order() {
 		money = BigDecimal.valueOf(0);
@@ -141,13 +138,13 @@
 		return id;
 	}
 
-	public List<OrderItem> getOrderItemList() {
-		return orderItemList;
-	}
-
-	public void setOrderItemList(List<OrderItem> orderItemList) {
-		this.orderItemList = orderItemList;
-	}
+//	public List<OrderItem> getOrderItemList() {
+//		return orderItemList;
+//	}
+//
+//public void setOrderItemList(List<OrderItem> orderItemList) {
+//	this.orderItemList = orderItemList;
+//}
 
 	public void setId(Long id) {
 		this.id = id;

--
Gitblit v1.8.0