From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新

---
 fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoods.java |  441 +++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 280 insertions(+), 161 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 8981c47..987023d 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,161 +1,280 @@
-package com.yeshi.fanli.entity.push;
-
-import java.util.Date;
-
-import org.yeshi.utils.mybatis.Column;
-import org.yeshi.utils.mybatis.Table;
-
-@Table("yeshi_ec_push_goods")
-public class PushGoods {
-
-	@Column(name = "pg_id")
-	private Long id;
-
-	// 鏄剧ず鏍囬
-	@Column(name = "pg_alert_title")
-	private String alertTitle;
-
-	// 鏄剧ず鍐呭
-	@Column(name = "pg_alert_content")
-	private String alertContent;
-	
-	// 椤甸潰鏍囬
-	@Column(name = "pg_title")
-	private String title;
-	
-	// 椤甸潰鍐呭(html)
-	@Column(name = "pg_content")
-	private String content;
-	
-	// 灏侀潰鍥剧墖
-	@Column(name = "pg_picture")
-	private String picture;
-	
-	// 鎺ㄩ�佺敤鎴穒d 浣跨敤浜庡崟鎺�
-	@Column(name = "pg_uid")
-	private Long uid;
-	
-	// 鏄惁宸叉帹閫�
-	@Column(name = "pg_is_push")
-	private boolean isPush;
-	
-	// 鎺ㄩ�佹椂闂�
-	@Column(name = "pg_push_time")
-	private Date pushTime;
-	
-	@Column(name = "pg_createtime")
-	private Date createTime;
-	
-	@Column(name = "pg_updatetime")
-	private Date updateTime;
-
-	
-	// 缁熻鍟嗗搧鏁伴噺
-	private Long countGoods; 
-	
-	
-	public PushGoods(){}
-	
-	public PushGoods(Long id){
-		this.id = id;
-	}
-	
-	
-	
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getAlertTitle() {
-		return alertTitle;
-	}
-
-	public void setAlertTitle(String alertTitle) {
-		this.alertTitle = alertTitle;
-	}
-
-	public String getAlertContent() {
-		return alertContent;
-	}
-
-	public void setAlertContent(String alertContent) {
-		this.alertContent = alertContent;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public String getContent() {
-		return content;
-	}
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	public boolean isPush() {
-		return isPush;
-	}
-
-	public void setPush(boolean isPush) {
-		this.isPush = isPush;
-	}
-
-	public Date getPushTime() {
-		return pushTime;
-	}
-
-	public void setPushTime(Date pushTime) {
-		this.pushTime = pushTime;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Long getUid() {
-		return uid;
-	}
-
-	public void setUid(Long uid) {
-		this.uid = uid;
-	}
-
-	public Long getCountGoods() {
-		return countGoods;
-	}
-
-	public void setCountGoods(Long countGoods) {
-		this.countGoods = countGoods;
-	}
-
-	public String getPicture() {
-		return picture;
-	}
-
-	public void setPicture(String picture) {
-		this.picture = picture;
-	}
-	
-}
+package com.yeshi.fanli.entity.push;
+
+import java.util.Date;
+import java.util.List;
+
+import com.yeshi.fanli.entity.SystemEnum;
+import org.yeshi.utils.generater.mybatis.Column;
+import org.yeshi.utils.generater.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;
+
+	// 鏄剧ず鏍囬
+	@Column(name = "pg_alert_title")
+	private String alertTitle;
+
+	// 鏄剧ず鍐呭
+	@Column(name = "pg_alert_content")
+	private String alertContent;
+	
+	// 椤甸潰鏍囬
+	@Column(name = "pg_title")
+	private String title;
+	
+	// 椤甸潰鍐呭(html)
+	@Column(name = "pg_content")
+	private String content;
+	
+	// 灏侀潰鍥剧墖
+	@Column(name = "pg_picture")
+	private String picture;
+	
+	// 鎺ㄩ�佺敤鎴穒d 浣跨敤浜庡崟鎺�
+	@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 Integer isPush;
+	
+	// 鎺ㄩ�佹椂闂�
+	@Column(name = "pg_push_time")
+	private Date pushTime;
+	
+	@Column(name = "pg_createtime")
+	private Date createTime;
+	
+	@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;
+	//绯荤粺
+	@Column(name = "pg_system")
+	private SystemEnum system;
+
+	public SystemEnum getSystem() {
+		return system;
+	}
+
+	public void setSystem(SystemEnum system) {
+		this.system = system;
+	}
+
+	// 瀹氭椂鏃堕棿
+	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;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getAlertTitle() {
+		return alertTitle;
+	}
+
+	public void setAlertTitle(String alertTitle) {
+		this.alertTitle = alertTitle;
+	}
+
+	public String getAlertContent() {
+		return alertContent;
+	}
+
+	public void setAlertContent(String alertContent) {
+		this.alertContent = alertContent;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	public Integer getIsPush() {
+		return isPush;
+	}
+
+	public void setIsPush(Integer isPush) {
+		this.isPush = isPush;
+	}
+
+	public Date getPushTime() {
+		return pushTime;
+	}
+
+	public void setPushTime(Date pushTime) {
+		this.pushTime = pushTime;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Long getCountGoods() {
+		return countGoods;
+	}
+
+	public void setCountGoods(Long countGoods) {
+		this.countGoods = countGoods;
+	}
+
+	public String getPicture() {
+		return picture;
+	}
+
+	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;
+	}
+	
+}

--
Gitblit v1.8.0