From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
index a34fe3f..0c453b1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
@@ -1,12 +1,8 @@
package com.yeshi.fanli.entity.bus.user;
-import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -19,27 +15,36 @@
*
* @date 2018骞�1鏈�29鏃�
*/
-@Entity
@Table(name = "yeshi_ec_threeSale")
@org.yeshi.utils.mybatis.Table("yeshi_ec_threeSale")
public class ThreeSale {
+ // 閭�璇风姸鎬�
+ public static int STATE_SUCCESS = 1;// 鎴愬姛
+ public static int STATE_NOT_SUCCESS = 0;// 灏氭湭鎴愬姛
+ // 鑴辩鐘舵��
public static int EXPIRE_NORMAL = 0;// 姝ｅ父鐘舵��
- public static int EXPIRE_OUTOFDATE = 1;// 杩囨湡鐘舵��
-
+ public static int EXPIRE_BREAK = 1;// 閭�璇峰叧绯昏劚绂�
+ public static int EXPIRE_BREAK_VIP = 2; // vip鑴辩鍏崇郴
+ public static int EXPIRE_BREAK_VIP_DEL3 = 3; // 鐩存帴鑴辩鍏崇郴鍒犻櫎
+ public static int EXPIRE_BREAK_VIP_DEL4 = 4; // 闂存帴鑴辩鍏崇郴鍒犻櫎
+ public static int EXPIRE_BREAK_VIP_DEL34 = 34; // 鐩存帴銆侀棿鎺ヨ劚绂诲叧绯诲垹闄�
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "id")
private Long id;
- @ManyToOne
- @JoinColumn(name = "boss_id")
+ public ThreeSale(Long id) {
+ this.id = id;
+ }
+
+ public ThreeSale() {
+ }
+
@Column(name = "boss_id")
private UserInfo boss;// 閭�璇疯��
- @OneToOne
- @JoinColumn(name = "worker_id")
@Column(name = "worker_id")
private UserInfo worker; // 琚個璇疯��
@@ -61,6 +66,13 @@
@Transient
private ThreeSaleExtraInfo threeSaleExtraInfo;
+
+ // 涓婁笂绾у叧绯荤姸鎬�
+ @Transient
+ private Boolean stateSuper;
+
+ @Transient
+ private Integer validState;
public Long getId() {
return id;
@@ -134,4 +146,20 @@
this.threeSaleExtraInfo = threeSaleExtraInfo;
}
+ public Boolean getStateSuper() {
+ return stateSuper;
+ }
+
+ public void setStateSuper(Boolean stateSuper) {
+ this.stateSuper = stateSuper;
+ }
+
+ public Integer getValidState() {
+ return validState;
+ }
+
+ public void setValidState(Integer validState) {
+ this.validState = validState;
+ }
+
}
--
Gitblit v1.8.0