From 62a447d89331aee1feae7724c7616aa1bb2cfe79 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 16 十月 2024 14:28:37 +0800
Subject: [PATCH] 将CMQ替换为rabbitmq

---
 fanli/src/main/java/com/yeshi/fanli/entity/elme/ElmeOrder.java |  444 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 241 insertions(+), 203 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/elme/ElmeOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/elme/ElmeOrder.java
index 2766a77..461f642 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/elme/ElmeOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/elme/ElmeOrder.java
@@ -1,203 +1,241 @@
-package com.yeshi.fanli.entity.elme;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.yeshi.utils.mybatis.Column;
-import org.yeshi.utils.mybatis.Table;
-
-/**
- * 楗夸簡涔堣鍗�
- * 
- * @author Administrator
- *
- */
-@Table("yeshi_ec_elme_order")
-public class ElmeOrder implements Serializable{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	@Column(name = "eo_id")
-	private Long id;
-	@Column(name = "eo_channel_id")
-	private String channelId;// 娓犻亾鍙�
-	@Column(name = "eo_channel_name")
-	private String channelName;// 娓犻亾鍚嶇О
-	@Column(name = "eo_track_pid")
-	private String trackPid;// track_pid
-	@Column(name = "eo_rid")
-	private String rid;// rid
-	@Column(name = "eo_order_date")
-	private Date orderDate;// 璁㈠崟鏃ユ湡
-	@Column(name = "eo_order_id")
-	private String orderId;// 璁㈠崟鍙�
-	@Column(name = "eo_pay_money")
-	private BigDecimal payMoney;// 鏀粯閲戦
-	@Column(name = "eo_city")
-	private String city;// 涓嬪崟鍩庡競
-	@Column(name = "eo_coupon_money")
-	private BigDecimal couponMoney;// 鐢ㄥ埜閲戦
-	@Column(name = "eo_newer_first_order")
-	private Integer newerFirstOrder;// 鏄惁鏂板棣栧崟
-	@Column(name = "eo_newer_repay_order")
-	private Integer newerRepayOrder;// 鏄惁鏂板澶嶈喘鍗�
-	@Column(name = "eo_taoke_hongbao")
-	private Integer taokeHongBao;// 鏄惁浣跨敤娣樺绾㈠寘
-	@Column(name = "eo_shop_click")
-	private Integer shopClick;// 鏄惁鏈夊湪浼氬満鍐呰闂ㄥ簵鐨勭偣鍑昏褰�
-	@Column(name = "eo_recieve_coupon_7day_first_order")
-	private Integer recieveCoupon7DayFirstOrder;// 鏄惁棰嗗埜鍚�7澶╁唴棣栧崟
-	@Column(name = "eo_settle")
-	private Boolean isSettle;// 鏄惁缁撲剑
-	@Column(name = "eo_create_time")
-	private Date createTime;
-	@Column(name = "eo_update_time")
-	private Date updateTime;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getChannelId() {
-		return channelId;
-	}
-
-	public void setChannelId(String channelId) {
-		this.channelId = channelId;
-	}
-
-	public String getChannelName() {
-		return channelName;
-	}
-
-	public void setChannelName(String channelName) {
-		this.channelName = channelName;
-	}
-
-	public String getTrackPid() {
-		return trackPid;
-	}
-
-	public void setTrackPid(String trackPid) {
-		this.trackPid = trackPid;
-	}
-
-	public String getRid() {
-		return rid;
-	}
-
-	public void setRid(String rid) {
-		this.rid = rid;
-	}
-
-	public Date getOrderDate() {
-		return orderDate;
-	}
-
-	public void setOrderDate(Date orderDate) {
-		this.orderDate = orderDate;
-	}
-
-	public String getOrderId() {
-		return orderId;
-	}
-
-	public void setOrderId(String orderId) {
-		this.orderId = orderId;
-	}
-
-	public BigDecimal getPayMoney() {
-		return payMoney;
-	}
-
-	public void setPayMoney(BigDecimal payMoney) {
-		this.payMoney = payMoney;
-	}
-
-	public String getCity() {
-		return city;
-	}
-
-	public void setCity(String city) {
-		this.city = city;
-	}
-
-	public BigDecimal getCouponMoney() {
-		return couponMoney;
-	}
-
-	public void setCouponMoney(BigDecimal couponMoney) {
-		this.couponMoney = couponMoney;
-	}
-
-	public Integer getNewerFirstOrder() {
-		return newerFirstOrder;
-	}
-
-	public void setNewerFirstOrder(Integer newerFirstOrder) {
-		this.newerFirstOrder = newerFirstOrder;
-	}
-
-	public Integer getNewerRepayOrder() {
-		return newerRepayOrder;
-	}
-
-	public void setNewerRepayOrder(Integer newerRepayOrder) {
-		this.newerRepayOrder = newerRepayOrder;
-	}
-
-	public Integer getTaokeHongBao() {
-		return taokeHongBao;
-	}
-
-	public void setTaokeHongBao(Integer taokeHongBao) {
-		this.taokeHongBao = taokeHongBao;
-	}
-
-	public Integer getShopClick() {
-		return shopClick;
-	}
-
-	public void setShopClick(Integer shopClick) {
-		this.shopClick = shopClick;
-	}
-
-	public Integer getRecieveCoupon7DayFirstOrder() {
-		return recieveCoupon7DayFirstOrder;
-	}
-
-	public void setRecieveCoupon7DayFirstOrder(Integer recieveCoupon7DayFirstOrder) {
-		this.recieveCoupon7DayFirstOrder = recieveCoupon7DayFirstOrder;
-	}
-
-	public Boolean getIsSettle() {
-		return isSettle;
-	}
-
-	public void setIsSettle(Boolean isSettle) {
-		this.isSettle = isSettle;
-	}
-
-	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;
-	}
-
-}
+package com.yeshi.fanli.entity.elme;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.yeshi.utils.generater.mybatis.Column;
+import org.yeshi.utils.generater.mybatis.Table;
+
+/**
+ * 楗夸簡涔堣鍗�
+ * 
+ * @author Administrator
+ *
+ */
+@Table("yeshi_ec_elme_order")
+public class ElmeOrder implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	@Column(name = "eo_id")
+	private Long id;
+	@Column(name = "eo_channel_id")
+	private String channelId;// 娓犻亾鍙�
+	@Column(name = "eo_channel_name")
+	private String channelName;// 娓犻亾鍚嶇О
+	@Column(name = "eo_track_pid")
+	private String trackPid;// track_pid
+	@Column(name = "eo_rid")
+	private String rid;// rid
+	@Column(name = "eo_order_date")
+	private Date orderDate;// 璁㈠崟鏃ユ湡
+	@Column(name = "eo_order_id")
+	private String orderId;// 璁㈠崟鍙�
+	@Column(name = "eo_pay_money")
+	private BigDecimal payMoney;// 鏀粯閲戦
+	@Column(name = "eo_city")
+	private String city;// 涓嬪崟鍩庡競
+	@Column(name = "eo_coupon_money")
+	private BigDecimal couponMoney;// 鐢ㄥ埜閲戦
+	@Column(name = "eo_newer_first_order")
+	private Integer newerFirstOrder;// 鏄惁鏂板棣栧崟
+	@Column(name = "eo_newer_repay_order")
+	private Integer newerRepayOrder;// 鏄惁鏂板澶嶈喘鍗�
+	@Column(name = "eo_taoke_hongbao")
+	private Integer taokeHongBao;// 鏄惁浣跨敤娣樺绾㈠寘
+	@Column(name = "eo_shop_click")
+	private Integer shopClick;// 鏄惁鏈夊湪浼氬満鍐呰闂ㄥ簵鐨勭偣鍑昏褰�
+	@Column(name = "eo_recieve_coupon_7day_first_order")
+	private Integer recieveCoupon7DayFirstOrder;// 鏄惁棰嗗埜鍚�7澶╁唴棣栧崟
+	@Column(name = "eo_settle")
+	private Boolean isSettle;// 鏄惁缁撲剑
+	@Column(name = "eo_create_time")
+	private Date createTime;
+	@Column(name = "eo_update_time")
+	private Date updateTime;
+	@Column(name = "eo_state")
+	private Integer state;//0-澶辨晥  1-鏈夋晥
+
+	
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	private Long uid;
+	private BigDecimal hongbao;
+	private Integer hbState;
+	
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getChannelId() {
+		return channelId;
+	}
+
+	public void setChannelId(String channelId) {
+		this.channelId = channelId;
+	}
+
+	public String getChannelName() {
+		return channelName;
+	}
+
+	public void setChannelName(String channelName) {
+		this.channelName = channelName;
+	}
+
+	public String getTrackPid() {
+		return trackPid;
+	}
+
+	public void setTrackPid(String trackPid) {
+		this.trackPid = trackPid;
+	}
+
+	public String getRid() {
+		return rid;
+	}
+
+	public void setRid(String rid) {
+		this.rid = rid;
+	}
+
+	public Date getOrderDate() {
+		return orderDate;
+	}
+
+	public void setOrderDate(Date orderDate) {
+		this.orderDate = orderDate;
+	}
+
+	public String getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(String orderId) {
+		this.orderId = orderId;
+	}
+
+	public BigDecimal getPayMoney() {
+		return payMoney;
+	}
+
+	public void setPayMoney(BigDecimal payMoney) {
+		this.payMoney = payMoney;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public BigDecimal getCouponMoney() {
+		return couponMoney;
+	}
+
+	public void setCouponMoney(BigDecimal couponMoney) {
+		this.couponMoney = couponMoney;
+	}
+
+	public Integer getNewerFirstOrder() {
+		return newerFirstOrder;
+	}
+
+	public void setNewerFirstOrder(Integer newerFirstOrder) {
+		this.newerFirstOrder = newerFirstOrder;
+	}
+
+	public Integer getNewerRepayOrder() {
+		return newerRepayOrder;
+	}
+
+	public void setNewerRepayOrder(Integer newerRepayOrder) {
+		this.newerRepayOrder = newerRepayOrder;
+	}
+
+	public Integer getTaokeHongBao() {
+		return taokeHongBao;
+	}
+
+	public void setTaokeHongBao(Integer taokeHongBao) {
+		this.taokeHongBao = taokeHongBao;
+	}
+
+	public Integer getShopClick() {
+		return shopClick;
+	}
+
+	public void setShopClick(Integer shopClick) {
+		this.shopClick = shopClick;
+	}
+
+	public Integer getRecieveCoupon7DayFirstOrder() {
+		return recieveCoupon7DayFirstOrder;
+	}
+
+	public void setRecieveCoupon7DayFirstOrder(Integer recieveCoupon7DayFirstOrder) {
+		this.recieveCoupon7DayFirstOrder = recieveCoupon7DayFirstOrder;
+	}
+
+	public Boolean getIsSettle() {
+		return isSettle;
+	}
+
+	public void setIsSettle(Boolean isSettle) {
+		this.isSettle = isSettle;
+	}
+
+	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 BigDecimal getHongbao() {
+		return hongbao;
+	}
+
+	public void setHongbao(BigDecimal hongbao) {
+		this.hongbao = hongbao;
+	}
+
+	public Integer getHbState() {
+		return hbState;
+	}
+
+	public void setHbState(Integer hbState) {
+		this.hbState = hbState;
+	}
+}

--
Gitblit v1.8.0