From 1340beb67a9b6d777821d0139bcc7c9b0896ed4e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 九月 2020 10:59:26 +0800
Subject: [PATCH] 拼多多比价修改
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java | 259 +++++++++++++++++++++++++++------------------------
1 files changed, 135 insertions(+), 124 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 14e851d..7b32839 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
@@ -7,104 +7,107 @@
/**
* 璁㈠崟
- *
- * @author Administrator
*
+ * @author Administrator
*/
@org.yeshi.utils.mybatis.Table("yeshi_ec_order")
public class Order {
- // 璁㈠崟鐘剁姸鎬� -1锛氬け鏁� 0-鏈敮浠� 1-宸叉敮浠�
- public final static int STATE_SHIXIAO = -1;
- public final static int STATE_WEIZHIFU = 0;
- public final static int STATE_YIZHIFU = 1;
+ // 璁㈠崟鐘剁姸鎬� -1锛氬け鏁� 0-鏈敮浠� 1-宸叉敮浠�
+ public final static int STATE_SHIXIAO = -1;
+ public final static int STATE_WEIZHIFU = 0;
+ public final static int STATE_YIZHIFU = 1;
- public final static int ORDER_TYPE_TAOBAO = 1;// 娣樺疂
- public final static int ORDER_TYPE_JINGDONG = 2;// 浜笢
- public final static int ORDER_TYPE_PDD = 3;// 鎷煎澶�
+ public final static int ORDER_TYPE_TAOBAO = 1;// 娣樺疂
+ public final static int ORDER_TYPE_JINGDONG = 2;// 浜笢
+ public final static int ORDER_TYPE_PDD = 3;// 鎷煎澶�
- @org.yeshi.utils.mybatis.Column(name = "id")
- @Expose
- private Long id;
+ @org.yeshi.utils.mybatis.Column(name = "id")
+ @Expose
+ private Long id;
- @org.yeshi.utils.mybatis.Column(name = "orderid")
- @Expose
- private String orderId;// 璁㈠崟缂栧彿
+ @org.yeshi.utils.mybatis.Column(name = "orderid")
+ @Expose
+ private String orderId;// 璁㈠崟缂栧彿
- @org.yeshi.utils.mybatis.Column(name = "order_type")
- @Expose
- private Integer orderType;// 璁㈠崟绫诲瀷 1-娣樺疂 2-浜笢
+ @org.yeshi.utils.mybatis.Column(name = "order_type")
+ @Expose
+ private Integer orderType;// 璁㈠崟绫诲瀷 1-娣樺疂 2-浜笢
- @org.yeshi.utils.mybatis.Column(name = "state")
- @Expose
- private Integer state;// 璁㈠崟鐘讹拷? -1锛氬け鏁�0-鏈敮浠�?1-宸叉敮璐�
+ @org.yeshi.utils.mybatis.Column(name = "state")
+ @Expose
+ private Integer state;// 璁㈠崟鐘舵�� -1锛氬け鏁�0-鏈敮浠�?1-宸叉敮璐�
- @org.yeshi.utils.mybatis.Column(name = "drawback_time")
- @Expose
- private Long drawbackTime;// 閫�娆炬椂闂�
+ @org.yeshi.utils.mybatis.Column(name = "state_desc")
+ @Expose
+ private String stateDesc;//璁㈠崟鎻忚堪
- @org.yeshi.utils.mybatis.Column(name = "createtime")
- @Expose
- private Long createtime;// 鍒涘缓鏃堕棿 浠樻鏃堕棿
+ @org.yeshi.utils.mybatis.Column(name = "drawback_time")
+ @Expose
+ private Long drawbackTime;// 閫�娆炬椂闂�
- @org.yeshi.utils.mybatis.Column(name = "uid")
- @Expose
- private UserInfo userInfo;
+ @org.yeshi.utils.mybatis.Column(name = "createtime")
+ @Expose
+ private Long createtime;// 鍒涘缓鏃堕棿 浠樻鏃堕棿
- @org.yeshi.utils.mybatis.Column(name = "beizhu")
- @Expose
- private String beizhu;
+ @org.yeshi.utils.mybatis.Column(name = "uid")
+ @Expose
+ private UserInfo userInfo;
- @org.yeshi.utils.mybatis.Column(name = "money")
- @Expose
- private BigDecimal money;
+ @org.yeshi.utils.mybatis.Column(name = "beizhu")
+ @Expose
+ private String beizhu;
- // 绗笁鏂硅鍗曞垱寤烘椂闂�
- @org.yeshi.utils.mybatis.Column(name = "third_createtime")
- @Expose
- private Date thirdCreateTime;
+ @org.yeshi.utils.mybatis.Column(name = "money")
+ @Expose
+ private BigDecimal money;
- // 绗笁鏂硅鍗曠姸鎬�
- @org.yeshi.utils.mybatis.Column(name = "third_state")
- @Expose
- private String thirdState;
+ // 绗笁鏂硅鍗曞垱寤烘椂闂�
+ @org.yeshi.utils.mybatis.Column(name = "third_createtime")
+ @Expose
+ private Date thirdCreateTime;
- public Date getThirdCreateTime() {
- return thirdCreateTime;
- }
+ // 绗笁鏂硅鍗曠姸鎬�
+ @org.yeshi.utils.mybatis.Column(name = "third_state")
+ @Expose
+ private String thirdState;
- public void setThirdCreateTime(Date thirdCreateTime) {
- this.thirdCreateTime = thirdCreateTime;
- }
+ public Date getThirdCreateTime() {
+ return thirdCreateTime;
+ }
- public String getThirdState() {
- return thirdState;
- }
+ public void setThirdCreateTime(Date thirdCreateTime) {
+ this.thirdCreateTime = thirdCreateTime;
+ }
- public void setThirdState(String thirdState) {
- this.thirdState = thirdState;
- }
+ public String getThirdState() {
+ return thirdState;
+ }
- /**
- * 鐗堟湰锛� 1锛�1.2.3v涔嬪墠锛�2:涔嬪悗
- */
- @org.yeshi.utils.mybatis.Column(name = "version")
- private Integer version;
+ public void setThirdState(String thirdState) {
+ this.thirdState = thirdState;
+ }
- public Order() {
- money = BigDecimal.valueOf(0);
- }
+ /**
+ * 鐗堟湰锛� 1锛�1.2.3v涔嬪墠锛�2:涔嬪悗
+ */
+ @org.yeshi.utils.mybatis.Column(name = "version")
+ private Integer version;
- public BigDecimal getMoney() {
- return money;
- }
+ public Order() {
+ money = BigDecimal.valueOf(0);
+ }
- public void setMoney(BigDecimal money) {
- this.money = money;
- }
+ public BigDecimal getMoney() {
+ return money;
+ }
- public Long getId() {
- return id;
- }
+ public void setMoney(BigDecimal money) {
+ this.money = money;
+ }
+
+ public Long getId() {
+ return id;
+ }
// public List<OrderItem> getOrderItemList() {
// return orderItemList;
@@ -114,72 +117,80 @@
// this.orderItemList = orderItemList;
//}
- public void setId(Long id) {
- this.id = id;
- }
+ public String getStateDesc() {
+ return stateDesc;
+ }
- public String getOrderId() {
- return orderId;
- }
+ public void setStateDesc(String stateDesc) {
+ this.stateDesc = stateDesc;
+ }
- public void setOrderId(String orderId) {
- this.orderId = orderId;
- }
+ public void setId(Long id) {
+ this.id = id;
+ }
- public Integer getOrderType() {
- return orderType;
- }
+ public String getOrderId() {
+ return orderId;
+ }
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
- public Integer getState() {
- return state;
- }
+ public Integer getOrderType() {
+ return orderType;
+ }
- public void setState(Integer state) {
- this.state = state;
- }
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
- public Long getDrawbackTime() {
- return drawbackTime;
- }
+ public Integer getState() {
+ return state;
+ }
- public void setDrawbackTime(Long drawbackTime) {
- this.drawbackTime = drawbackTime;
- }
+ public void setState(Integer state) {
+ this.state = state;
+ }
- public Long getCreatetime() {
- return createtime;
- }
+ public Long getDrawbackTime() {
+ return drawbackTime;
+ }
- public void setCreatetime(Long createtime) {
- this.createtime = createtime;
- }
+ public void setDrawbackTime(Long drawbackTime) {
+ this.drawbackTime = drawbackTime;
+ }
- public UserInfo getUserInfo() {
- return userInfo;
- }
+ public Long getCreatetime() {
+ return createtime;
+ }
- public void setUserInfo(UserInfo userInfo) {
- this.userInfo = userInfo;
- }
+ public void setCreatetime(Long createtime) {
+ this.createtime = createtime;
+ }
- public String getBeizhu() {
- return beizhu;
- }
+ public UserInfo getUserInfo() {
+ return userInfo;
+ }
- public void setBeizhu(String beizhu) {
- this.beizhu = beizhu;
- }
+ public void setUserInfo(UserInfo userInfo) {
+ this.userInfo = userInfo;
+ }
- public Integer getVersion() {
- return version;
- }
+ public String getBeizhu() {
+ return beizhu;
+ }
- public void setVersion(Integer version) {
- this.version = version;
- }
+ public void setBeizhu(String beizhu) {
+ this.beizhu = beizhu;
+ }
+
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
}
--
Gitblit v1.8.0