From 5e7b0ed4a154ad067cbcf4aa1a1c7cce32f9864c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 26 四月 2024 18:02:17 +0800
Subject: [PATCH] 唯品会链接解析升级

---
 fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java |  606 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 314 insertions(+), 292 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java
index f033fe3..fbcbc51 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrder.java
@@ -1,292 +1,314 @@
-package com.yeshi.fanli.entity.order;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.yeshi.utils.mybatis.Column;
-import org.yeshi.utils.mybatis.Table;
-
-import com.google.gson.annotations.Expose;
-import com.yeshi.fanli.entity.bus.user.UserInfo;
-
-/**
- * 璁㈠崟-绠�鐗�
- * 
- * @author yj
- *
- * @date 2018骞�12鏈�23鏃�
- */
-
-@Table("yeshi_ec_common_order")
-public class CommonOrder {
-
-	// 璁㈠崟鐘舵�� 1-浠樻锛屾垚鍔� 2-缁撶畻锛堝凡鏀惰揣锛� 3-缁存潈 4-澶辨晥
-	public final static int STATE_FK = 1;
-	public final static int STATE_JS = 2;
-	public final static int STATE_WQ = 3;
-	public final static int STATE_SX = 4;
-
-	// 鏁翠釜璁㈠崟鐘舵�� 1-鏈夋晥 2-閮ㄥ垎鏈夋晥/澶辨晥 3-澶辨晥
-	public final static int STATE_WHOLE_ORDER_YOUXIAO = 1;
-	public final static int STATE_WHOLE_ORDER_BUFENYOUXIAO = 2;
-	public final static int STATE_WHOLE_ORDER_SHIXIAO = 3;
-
-	// 璁㈠崟绾㈠寘绫诲瀷鍥剧墖
-	public final static String TYPE_FANLI = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_fanli.png";
-	public final static String TYPE_INVITE = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_invite.png";
-	public final static String TYPE_SHARE = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_share.png";
-
-	public final static int ORDER_TYPE_ZIGOU = 1;// 鑷喘
-	public final static int ORDER_TYPE_SHARE = 20;// 鍒嗕韩
-
-	@Column(name = "co_id")
-	private Long id;
-
-	// 鐢ㄦ埛id
-	@Column(name = "co_uid")
-	private UserInfo userInfo;
-
-	// 璁㈠崟鍙�
-	@Expose
-	@Column(name = "co_order_no")
-	private String orderNo;
-
-	// 绫诲瀷锛氭窐瀹�/浜笢
-	@Expose
-	@Column(name = "co_source_type")
-	private Integer sourceType;
-
-	// 缁勫悎鏉ユ簮
-	@Column(name = "co_source_position")
-	private String sourcePosition;
-
-	// 鍟嗗搧
-	@Expose
-	@Column(name = "co_order_goods_id")
-	private CommonOrderGoods commonOrderGoods;
-
-	// 鍟嗗搧鏁�
-	@Column(name = "co_count")
-	private Integer count;
-
-	// 鐘舵�侊細璁㈠崟浠樻銆佽鍗曞け鏁堛�佽鍗曠粨绠�
-	@Expose
-	@Column(name = "co_state")
-	private Integer state;
-
-	// 鏁翠釜璁㈠崟鐘舵�侊細鏈夋晥 銆� 閮ㄥ垎鏈夋晥/澶辨晥 銆� 澶辨晥
-	@Expose
-	@Column(name = "co_state_whole_order")
-	private Integer stateWholeOrder;
-
-	// 鏁堟灉棰勪及
-	@Column(name = "co_estimate")
-	private BigDecimal estimate;
-
-	// 棰勪及鏀跺叆
-	@Column(name = "co_eIncome")
-	private BigDecimal eIncome;
-
-	// 浠樻閲戦
-	@Column(name = "co_payment")
-	private BigDecimal payment;
-
-	// 缁撶畻閲戦
-	@Column(name = "co_settlement")
-	private BigDecimal settlement;
-
-	// 涓嬪崟鏃堕棿-绗笁鏂瑰垱寤烘椂闂�
-	@Column(name = "co_third_create_time")
-	private Date thirdCreateTime;
-
-	// 鏀惰揣鏃堕棿-缁撶畻鏃堕棿
-	@Column(name = "co_settle_time")
-	private Date settleTime;
-
-	@Column(name = "co_order_by")
-	private Integer orderBy;// 瀛愯鍗曠殑鎺掑簭鍊�
-
-	@Column(name = "co_trade_id")
-	private String tradeId;
-
-	// 鐘舵�佽鏄�
-	@Column(name = "co_state_desc")
-	private String stateDesc;
-
-	// 鍒涘缓鏃堕棿
-	@Column(name = "co_create_time")
-	private Date createTime;
-
-	// 鏇存柊鏃堕棿
-	@Column(name = "co_update_time")
-	private Date updateTime;
-
-	public CommonOrder() {
-
-	}
-
-	public CommonOrder(Long id) {
-		this.id = id;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public UserInfo getUserInfo() {
-		return userInfo;
-	}
-
-	public void setUserInfo(UserInfo userInfo) {
-		this.userInfo = userInfo;
-	}
-
-	public String getOrderNo() {
-		return orderNo;
-	}
-
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
-	}
-
-	public Integer getSourceType() {
-		return sourceType;
-	}
-
-	public void setSourceType(Integer sourceType) {
-		this.sourceType = sourceType;
-	}
-
-	public String getSourcePosition() {
-		return sourcePosition;
-	}
-
-	public void setSourcePosition(String sourcePosition) {
-		this.sourcePosition = sourcePosition;
-	}
-
-	public CommonOrderGoods getCommonOrderGoods() {
-		return commonOrderGoods;
-	}
-
-	public void setCommonOrderGoods(CommonOrderGoods commonOrderGoods) {
-		this.commonOrderGoods = commonOrderGoods;
-	}
-
-	public Integer getCount() {
-		return count;
-	}
-
-	public void setCount(Integer count) {
-		this.count = count;
-	}
-
-	public Integer getState() {
-		return state;
-	}
-
-	public void setState(Integer state) {
-		this.state = state;
-	}
-
-	public BigDecimal getEstimate() {
-		return estimate;
-	}
-
-	public void setEstimate(BigDecimal estimate) {
-		this.estimate = estimate;
-	}
-
-	public BigDecimal geteIncome() {
-		return eIncome;
-	}
-
-	public void seteIncome(BigDecimal eIncome) {
-		this.eIncome = eIncome;
-	}
-
-	public BigDecimal getPayment() {
-		return payment;
-	}
-
-	public void setPayment(BigDecimal payment) {
-		this.payment = payment;
-	}
-
-	public BigDecimal getSettlement() {
-		return settlement;
-	}
-
-	public void setSettlement(BigDecimal settlement) {
-		this.settlement = settlement;
-	}
-
-	public Date getThirdCreateTime() {
-		return thirdCreateTime;
-	}
-
-	public void setThirdCreateTime(Date thirdCreateTime) {
-		this.thirdCreateTime = thirdCreateTime;
-	}
-
-	public Date getSettleTime() {
-		return settleTime;
-	}
-
-	public void setSettleTime(Date settleTime) {
-		this.settleTime = settleTime;
-	}
-
-	public Integer getOrderBy() {
-		return orderBy;
-	}
-
-	public void setOrderBy(Integer orderBy) {
-		this.orderBy = orderBy;
-	}
-
-	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 Integer getStateWholeOrder() {
-		return stateWholeOrder;
-	}
-
-	public void setStateWholeOrder(Integer stateWholeOrder) {
-		this.stateWholeOrder = stateWholeOrder;
-	}
-
-	public String getTradeId() {
-		return tradeId;
-	}
-
-	public void setTradeId(String tradeId) {
-		this.tradeId = tradeId;
-	}
-
-	public String getStateDesc() {
-		return stateDesc;
-	}
-
-	public void setStateDesc(String stateDesc) {
-		this.stateDesc = stateDesc;
-	}
-
-}
+package com.yeshi.fanli.entity.order;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.yeshi.utils.generater.mybatis.Column;
+import org.yeshi.utils.generater.mybatis.Table;
+
+import com.google.gson.annotations.Expose;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
+
+/**
+ * 璁㈠崟-绠�鐗�
+ * 
+ * @author yj
+ *
+ * @date 2018骞�12鏈�23鏃�
+ */
+
+@Table("yeshi_ec_common_order")
+public class CommonOrder {
+
+	// 璁㈠崟鐘舵�� 1-浠樻锛屾垚鍔� 2-缁撶畻锛堝凡鏀惰揣锛� 3-缁存潈 4-澶辨晥
+	public final static int STATE_FK = 1;
+	public final static int STATE_JS = 2;
+	public final static int STATE_WQ = 3;
+	public final static int STATE_SX = 4;
+
+	// 鏁翠釜璁㈠崟鐘舵�� 1-鏈夋晥 2-閮ㄥ垎鏈夋晥/澶辨晥 3-澶辨晥
+	public final static int STATE_WHOLE_ORDER_YOUXIAO = 1;
+	public final static int STATE_WHOLE_ORDER_BUFENYOUXIAO = 2;
+	public final static int STATE_WHOLE_ORDER_SHIXIAO = 3;
+
+	// 璁㈠崟绾㈠寘绫诲瀷鍥剧墖
+	public final static String TYPE_FANLI = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_fanli.png";
+	public final static String TYPE_INVITE = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_invite.png";
+	public final static String TYPE_SHARE = "http://ec-1255749512.file.myqcloud.com/resource/order/icon_share.png";
+
+	public final static int ORDER_TYPE_ZIGOU = 1;// 鑷喘
+	public final static int ORDER_TYPE_SHARE = 20;// 鍒嗕韩
+
+	@Column(name = "co_id")
+	private Long id;
+
+	// 鐢ㄦ埛id
+	@Column(name = "co_uid")
+	private UserInfo userInfo;
+
+	// 璁㈠崟鍙�
+	@Expose
+	@Column(name = "co_order_no")
+	private String orderNo;
+
+	// 绫诲瀷锛氭窐瀹�/浜笢
+	@Expose
+	@Column(name = "co_source_type")
+	private Integer sourceType;
+
+	// 缁勫悎鏉ユ簮
+	@Column(name = "co_source_position")
+	private String sourcePosition;
+
+	// 鍟嗗搧
+	@Expose
+	@Column(name = "co_order_goods_id")
+	private CommonOrderGoods commonOrderGoods;
+
+	// 鍟嗗搧鏁�
+	@Column(name = "co_count")
+	private Integer count;
+
+	// 鐘舵�侊細璁㈠崟浠樻銆佽鍗曞け鏁堛�佽鍗曠粨绠�
+	@Expose
+	@Column(name = "co_state")
+	private Integer state;
+
+	// 鏁翠釜璁㈠崟鐘舵�侊細鏈夋晥 銆� 閮ㄥ垎鏈夋晥/澶辨晥 銆� 澶辨晥
+	@Expose
+	@Column(name = "co_state_whole_order")
+	private Integer stateWholeOrder;
+
+	// 鏁堟灉棰勪及
+	@Column(name = "co_estimate")
+	private BigDecimal estimate;
+
+	// 棰勪及鏀跺叆
+	@Column(name = "co_eIncome")
+	private BigDecimal eIncome;
+
+	// 浠樻閲戦
+	@Column(name = "co_payment")
+	private BigDecimal payment;
+
+	// 缁撶畻閲戦
+	@Column(name = "co_settlement")
+	private BigDecimal settlement;
+
+	// 涓嬪崟鏃堕棿-绗笁鏂瑰垱寤烘椂闂�
+	@Column(name = "co_third_create_time")
+	private Date thirdCreateTime;
+
+	// 鏀惰揣鏃堕棿-缁撶畻鏃堕棿
+	@Column(name = "co_settle_time")
+	private Date settleTime;
+
+	@Column(name = "co_order_by")
+	private Integer orderBy;// 瀛愯鍗曠殑鎺掑簭鍊�
+
+	@Column(name = "co_trade_id")
+	private String tradeId;
+
+	// 鐘舵�佽鏄�
+	@Column(name = "co_state_desc")
+	private String stateDesc;
+
+	// 鍒涘缓鏃堕棿
+	@Column(name = "co_create_time")
+	private Date createTime;
+
+	// 鏇存柊鏃堕棿
+	@Column(name = "co_update_time")
+	private Date updateTime;
+
+	@Column(name = "co_urank")
+	private Integer urank;// 鐢ㄦ埛绛夌骇 100-涓鸿秴绾т細鍛�
+
+	@Column(name = "co_child_source_type")
+	private String childSourceType;// 瀛愭潵婧愮被鍨�
+
+	public String getChildSourceType() {
+		return childSourceType;
+	}
+
+	public void setChildSourceType(String childSourceType) {
+		this.childSourceType = childSourceType;
+	}
+
+	public Integer getUrank() {
+		return urank;
+	}
+
+	public void setUrank(Integer urank) {
+		this.urank = urank;
+	}
+
+	public CommonOrder() {
+
+	}
+
+	public CommonOrder(Long id) {
+		this.id = id;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public UserInfo getUserInfo() {
+		return userInfo;
+	}
+
+	public void setUserInfo(UserInfo userInfo) {
+		this.userInfo = userInfo;
+	}
+
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public Integer getSourceType() {
+		return sourceType;
+	}
+
+	public void setSourceType(Integer sourceType) {
+		this.sourceType = sourceType;
+	}
+
+	public String getSourcePosition() {
+		return sourcePosition;
+	}
+
+	public void setSourcePosition(String sourcePosition) {
+		this.sourcePosition = sourcePosition;
+	}
+
+	public CommonOrderGoods getCommonOrderGoods() {
+		return commonOrderGoods;
+	}
+
+	public void setCommonOrderGoods(CommonOrderGoods commonOrderGoods) {
+		this.commonOrderGoods = commonOrderGoods;
+	}
+
+	public Integer getCount() {
+		return count;
+	}
+
+	public void setCount(Integer count) {
+		this.count = count;
+	}
+
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	public BigDecimal getEstimate() {
+		return estimate;
+	}
+
+	public void setEstimate(BigDecimal estimate) {
+		this.estimate = estimate;
+	}
+
+	public BigDecimal geteIncome() {
+		return eIncome;
+	}
+
+	public void seteIncome(BigDecimal eIncome) {
+		this.eIncome = eIncome;
+	}
+
+	public BigDecimal getPayment() {
+		return payment;
+	}
+
+	public void setPayment(BigDecimal payment) {
+		this.payment = payment;
+	}
+
+	public BigDecimal getSettlement() {
+		return settlement;
+	}
+
+	public void setSettlement(BigDecimal settlement) {
+		this.settlement = settlement;
+	}
+
+	public Date getThirdCreateTime() {
+		return thirdCreateTime;
+	}
+
+	public void setThirdCreateTime(Date thirdCreateTime) {
+		this.thirdCreateTime = thirdCreateTime;
+	}
+
+	public Date getSettleTime() {
+		return settleTime;
+	}
+
+	public void setSettleTime(Date settleTime) {
+		this.settleTime = settleTime;
+	}
+
+	public Integer getOrderBy() {
+		return orderBy;
+	}
+
+	public void setOrderBy(Integer orderBy) {
+		this.orderBy = orderBy;
+	}
+
+	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 Integer getStateWholeOrder() {
+		return stateWholeOrder;
+	}
+
+	public void setStateWholeOrder(Integer stateWholeOrder) {
+		this.stateWholeOrder = stateWholeOrder;
+	}
+
+	public String getTradeId() {
+		return tradeId;
+	}
+
+	public void setTradeId(String tradeId) {
+		this.tradeId = tradeId;
+	}
+
+	public String getStateDesc() {
+		return stateDesc;
+	}
+
+	public void setStateDesc(String stateDesc) {
+		this.stateDesc = stateDesc;
+	}
+
+}

--
Gitblit v1.8.0