Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java

@@ -1,20 +1,12 @@
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;

import javax.persistence.FetchType;

import javax.persistence.GeneratedValue;

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;



@@ -26,7 +18,6 @@
 * @author Administrator

 *

 */

@Entity

@Table(name = "yeshi_ec_order", uniqueConstraints = @UniqueConstraint(columnNames = { "orderid", "order_type" }) )

@org.yeshi.utils.mybatis.Table("yeshi_ec_order")

public class Order {

@@ -37,6 +28,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)

@@ -71,8 +63,6 @@
   private Long createtime;// 创建时间 付款时间



   @org.yeshi.utils.mybatis.Column(name = "uid")

   @ManyToOne(fetch = FetchType.EAGER)

   @JoinColumn(name = "uid")

   @Expose

   private UserInfo userInfo;



@@ -120,11 +110,6 @@
   @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>();



   public Order() {

      money = BigDecimal.valueOf(0);

   }

@@ -141,13 +126,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;