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/push/PushGoods.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 105 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java b/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java
index e361c36..ee68ff9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java
@@ -1,13 +1,23 @@
package com.yeshi.fanli.entity.push;
import java.util.Date;
+import java.util.List;
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
@Table("yeshi_ec_push_goods")
public class PushGoods {
-
+
+ // 鎺ㄩ�佺姸鎬侊細 0鏈帹閫� 1鎺ㄩ�佹垚鍔� 2鎺ㄩ�佸け璐�
+ public final static int STATE_INIT = 0;
+ public final static int STATE_SUCCESS = 1;
+ public final static int STATE_FAIL = 2;
+
+ public final static int TYPE_GOODS = 1;
+ public final static int TYPE_ACTIVITY = 2;
+
+
@Column(name = "pg_id")
private Long id;
@@ -32,15 +42,23 @@
private String picture;
// 鎺ㄩ�佺敤鎴穒d 浣跨敤浜庡崟鎺�
-// @Column(name = "pg_uid")
+ @Column(name = "pg_uid")
private Long uid;
@Column(name = "pg_versions")
private String versions;
+ // 棰勮鎺ㄩ�佹椂闂�
+ @Column(name = "pg_control_time")
+ private Date controlTime;
+
+ // 澶囨敞
+ @Column(name = "pg_remark")
+ private String remark;
+
// 鏄惁宸叉帹閫�
@Column(name = "pg_is_push")
- private boolean isPush;
+ private Integer isPush;
// 鎺ㄩ�佹椂闂�
@Column(name = "pg_push_time")
@@ -51,19 +69,32 @@
@Column(name = "pg_updatetime")
private Date updateTime;
-
+
+ // 绫诲瀷
+ @Column(name = "pg_type")
+ private Integer type;
+ // 鍏朵粬鍙傛暟
+ @Column(name = "pg_other_id")
+ private String otherId;
+ // 娴忚娆℃暟
+ @Column(name = "pg_scan_num")
+ private Integer scanNum;
+
+ // 瀹氭椂鏃堕棿
+ private String controlTime_str;
// 缁熻鍟嗗搧鏁伴噺
private Long countGoods;
-
+ // ios鎺ㄩ�佺増鏈�
+ private List<String> listIOS;
+ // Android鎺ㄩ�佺増鏈�
+ private List<String> listAndroid;
public PushGoods(){}
public PushGoods(Long id){
this.id = id;
}
-
-
public Long getId() {
return id;
@@ -105,11 +136,11 @@
this.content = content;
}
- public boolean isPush() {
+ public Integer getIsPush() {
return isPush;
}
- public void setPush(boolean isPush) {
+ public void setIsPush(Integer isPush) {
this.isPush = isPush;
}
@@ -168,5 +199,70 @@
public void setUid(Long uid) {
this.uid = uid;
}
+
+ public List<String> getListIOS() {
+ return listIOS;
+ }
+
+ public void setListIOS(List<String> listIOS) {
+ this.listIOS = listIOS;
+ }
+
+ public List<String> getListAndroid() {
+ return listAndroid;
+ }
+
+ public void setListAndroid(List<String> listAndroid) {
+ this.listAndroid = listAndroid;
+ }
+
+ public Date getControlTime() {
+ return controlTime;
+ }
+
+ public void setControlTime(Date controlTime) {
+ this.controlTime = controlTime;
+ }
+
+
+ public String getControlTime_str() {
+ return controlTime_str;
+ }
+
+ public void setControlTime_str(String controlTime_str) {
+ this.controlTime_str = controlTime_str;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getScanNum() {
+ return scanNum;
+ }
+
+ public void setScanNum(Integer scanNum) {
+ this.scanNum = scanNum;
+ }
+
+ public String getOtherId() {
+ return otherId;
+ }
+
+ public void setOtherId(String otherId) {
+ this.otherId = otherId;
+ }
}
--
Gitblit v1.8.0