fanli-server.git

			@@ -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;

			@@ -35,9 +45,20 @@
			@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")
			@@ -48,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;
			@@ -102,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;
			}

			@@ -134,14 +168,6 @@
			this.updateTime = updateTime;
			}

			public Long getUid() {
			return uid;
			}

			public void setUid(Long uid) {
			this.uid = uid;
			}

			public Long getCountGoods() {
			return countGoods;
			}
			@@ -157,5 +183,86 @@
			public void setPicture(String picture) {
			this.picture = picture;
			}

			public String getVersions() {
			return versions;
			}

			public void setVersions(String versions) {
			this.versions = versions;
			}

			public Long getUid() {
			return uid;
			}

			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;
			}

			}