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 | 53 ++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 40 insertions(+), 13 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 249e895..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 @@ -13,7 +13,11 @@ 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; @@ -65,9 +69,17 @@ @Column(name = "pg_updatetime") private Date updateTime; - - // 鏄惁瀹氭椂 - private Boolean timeTask; + + // 绫诲瀷 + @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; @@ -83,8 +95,6 @@ public PushGoods(Long id){ this.id = id; } - - public Long getId() { return id; @@ -214,13 +224,6 @@ this.controlTime = controlTime; } - public Boolean isTimeTask() { - return timeTask; - } - - public void setTimeTask(Boolean timeTask) { - this.timeTask = timeTask; - } public String getControlTime_str() { return controlTime_str; @@ -237,5 +240,29 @@ 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