From 46b375c499c43c704fcc6c23d191251cea4bb859 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 17:38:47 +0800
Subject: [PATCH] 刪除OrderItem和ThreeSaleGift
---
fanli/src/main/java/com/yeshi/fanli/dto/order/OrderItem.java | 46 +++-------------------------------------------
1 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/OrderItem.java b/fanli/src/main/java/com/yeshi/fanli/dto/order/OrderItem.java
similarity index 78%
rename from fanli/src/main/java/com/yeshi/fanli/entity/bus/user/OrderItem.java
rename to fanli/src/main/java/com/yeshi/fanli/dto/order/OrderItem.java
index 73dcb14..dc3011a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/OrderItem.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/order/OrderItem.java
@@ -1,23 +1,11 @@
-package com.yeshi.fanli.entity.bus.user;
+package com.yeshi.fanli.dto.order;
import java.math.BigDecimal;
-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.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
import com.google.gson.annotations.Expose;
-import org.yeshi.utils.mybatis.Column;
+import com.yeshi.fanli.entity.bus.user.Order;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
-@Entity
-@Table(name = "yeshi_ec_order_item")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_order_item")
public class OrderItem {
// -1:閫�娆� 1宸叉敮浠� 2缁撶畻 3宸插埌璐� 4鍞悗
public final static int STATE_TUIKUAN = -1;
@@ -26,86 +14,58 @@
public final static int STATE_DAOZHANG = 3;
public final static int STATE_SHOUHOU = 4;
- @Column(name = "id")
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @Expose
private Long id;
public OrderItem(Long id) {
this.id = id;
}
- @Column(name = "picture")
@Expose
private String picture;// 鍥剧墖
- @Column(name = "auctionId")
@Expose
private Long auctionId;// 鍟嗗搧ID
- @Column(name = "title")
@Expose
private String title;// 鍟嗗搧鍚嶇О
- @Column(name = "orderId")
@Expose
private String orderId;// 璁㈠崟鍙�
- @Column(name = "type")
private Integer type;// 璁㈠崟绫诲瀷
- @Column(name = "state")
@Expose
private Integer state; // -1:閫�娆� 1宸叉敮浠� 2缁撶畻 3宸插埌璐� 4鍞悗
- @Column(name = "payMoney")
@Expose
private BigDecimal payMoney;// 浠樻閲戦
- @Column(name = "fanMoney")
@Expose
private BigDecimal fanMoney;// 杩斿埄閲戦
- @Column(name = "createTime")
@Expose
private Long createTime;
- @Column(name = "settlementTime")
private Long settlementTime;// 缁撶畻鏃堕棿
- @Column(name = "refundTime")
private Long refundTime;// 閫�娆炬椂闂�
- @Column(name = "fanTime")
private Long fanTime;// 杩斿埄鏃堕棿
- @Column(name = "isGift")
private Boolean isGift;// 鏄惁鏈夊垎閿�鎻愭垚 true锛氭湁
- @Transient
@Expose
private String desc;
- @Column(name = "uid")
- @ManyToOne
- @JoinColumn(name = "uid")
private UserInfo userInfo;
- @Column(name = "oid")
- @ManyToOne
- @JoinColumn(name = "oid")
private Order order;
- @Column(name = "version")
private Integer version;// 鐗堟湰1.2.3涔嬪墠涓�1 鍚庝负2
- @Column(name = "pre_pay_money")
- @javax.persistence.Column(name = "pre_pay_money")
private BigDecimal prePayMoney;
@Expose
- @Transient
private String stateDesc;// 鐘舵�佺畝浠�
public String getStateDesc() {
--
Gitblit v1.8.0