From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoCoupon.java | 247 +++++++++++++++++++++++++++++--------------------
1 files changed, 147 insertions(+), 100 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoCoupon.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoCoupon.java
index eeed7f1..e82ac07 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoCoupon.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoCoupon.java
@@ -2,142 +2,141 @@
import java.math.BigDecimal;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
import javax.persistence.Transient;
+
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
import com.google.gson.annotations.Expose;
-@Table(name = "yeshi_ec_taobao_coupon")
-@Entity
+
+@Table("yeshi_ec_taobao_coupon")
public class TaoBaoCoupon {
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name = "id")
@Expose
- private long id;
+ @Column(name = "id")
+ private Long id;
+
@Expose
@Column(name = "auctionId")
private String auctionId;
- @Column(name = "`title`")
+
@Expose
+ @Column(name = "title")
private String title;
+
@Expose
+ @Column(name = "pictUrl")
private String pictUrl;
+
@Expose
+ @Column(name = "auctionUrl")
private String auctionUrl;
+
+ @Column(name = "classNames")
private String classNames; // 鍒嗙被鍚嶇О 澶氱骇鍒嗙被/鍒嗗紑
- @Column(name = "`taobaokeUrl`", length = 1024)
+
+ @Column(name = "taobaokeUrl")
private String taobaokeUrl;
+
@Expose
+ @Column(name = "zkPrice")
private BigDecimal zkPrice; // 鏃犵嚎浠锋牸
+
@Expose
- private int biz30day;
+ @Column(name = "biz30day")
+ private Integer biz30day;
+
@Expose
- private double tkRate; // 姣斾緥
+ @Column(name = "tkRate")
+ private Double tkRate; // 姣斾緥
+
+ @Column(name = "brokerage")
private BigDecimal brokerage; // 浣ｉ噾
+
+ @Column(name = "shopWangWang")
private String shopWangWang; // 搴楅摵鏃烘椇
- private long sellerId;// 鍗栧Id
+
+ @Column(name = "sellerId")
+ private Long sellerId;// 鍗栧Id
+
+ @Column(name = "shopTitle")
private String shopTitle; // 搴楅摵鍚嶇О
+
@Expose
- private int shopType; // 骞冲彴绫诲瀷 1-娣樺疂 2-澶╃尗 0-鍏朵粬
+ @Column(name = "shopType")
+ private Integer shopType; // 骞冲彴绫诲瀷 1-娣樺疂 2-澶╃尗 0-鍏朵粬
+
+ @Column(name = "couponId")
private String couponId; // 浼樻儬鍒窱D
- private int couponSum; // 浼樻儬鍒告�绘暟
- private int couponCount; // 浼樻儬鍒稿墿浣欓噺
+
+ @Column(name = "couponSum")
+ private Integer couponSum; // 浼樻儬鍒告�绘暟
+
+ @Column(name = "couponCount")
+ private Integer couponCount; // 浼樻儬鍒稿墿浣欓噺
+
@Expose
+ @Column(name = "couponinfo")
private String couponinfo; // 浼樻儬鍒镐俊鎭�
+
+ @Column(name = "couponStartFee")
private BigDecimal couponStartFee; // 浼樻儬鍒歌捣濮嬮噾棰�
+
+ @Column(name = "couponAmount")
private BigDecimal couponAmount; // 浼樻儬鍒搁噾棰�
+
@Expose
+ @Column(name = "quanPrice")
private BigDecimal quanPrice;
+
+ @Column(name = "couponBegin")
private String couponBegin;
+
+ @Column(name = "couponEnd")
private String couponEnd;
- @Column(name = "couponLink", length = 1024)
+
+ @Column(name = "couponLink")
private String couponLink;
- @Column(name = "generalizeUrl", length = 1024)
+
+ @Column(name = "generalizeUrl")
private String generalizeUrl; // 鎺ㄥ箍URl
+
@Expose
- private int orderby;
+ @Column(name = "orderby")
+ private Integer orderby;
+
@Expose
- private long createtime;
-
+ @Column(name = "createtime")
+ private Long createtime;
+
+ @Expose
+ @Column(name = "showType")
+ private Integer showType;
+
@Expose
@Transient
private BigDecimal hongbao;
- @Expose
- private int showType; //
-
- public TaoBaoCoupon() {
- }
+
+
+ public TaoBaoCoupon() {}
public TaoBaoCoupon(long id) {
super();
this.id = id;
}
- public long getId() {
+
+ public Long getId() {
return id;
}
- public void setId(long id) {
+ public void setId(Long id) {
this.id = id;
- }
-
- public int getShowType() {
- return showType;
- }
-
- public void setShowType(int showType) {
- this.showType = showType;
- }
-
- public BigDecimal getHongbao() {
- return hongbao;
- }
-
- public void setHongbao(BigDecimal hongbao) {
- this.hongbao = hongbao;
- }
-
- public BigDecimal getQuanPrice() {
- return quanPrice;
- }
-
- public void setQuanPrice(BigDecimal quanPrice) {
- this.quanPrice = quanPrice;
}
public String getAuctionId() {
return auctionId;
- }
-
- public BigDecimal getCouponStartFee() {
- return couponStartFee;
- }
-
- public int getOrderby() {
- return orderby;
- }
-
- public void setOrderby(int orderby) {
- this.orderby = orderby;
- }
-
- public void setCouponStartFee(BigDecimal couponStartFee) {
- this.couponStartFee = couponStartFee;
- }
-
- public BigDecimal getCouponAmount() {
- return couponAmount;
- }
-
- public void setCouponAmount(BigDecimal couponAmount) {
- this.couponAmount = couponAmount;
}
public void setAuctionId(String auctionId) {
@@ -192,19 +191,19 @@
this.zkPrice = zkPrice;
}
- public int getBiz30day() {
+ public Integer getBiz30day() {
return biz30day;
}
- public void setBiz30day(int biz30day) {
+ public void setBiz30day(Integer biz30day) {
this.biz30day = biz30day;
}
- public double getTkRate() {
+ public Double getTkRate() {
return tkRate;
}
- public void setTkRate(double tkRate) {
+ public void setTkRate(Double tkRate) {
this.tkRate = tkRate;
}
@@ -224,11 +223,11 @@
this.shopWangWang = shopWangWang;
}
- public long getSellerId() {
+ public Long getSellerId() {
return sellerId;
}
- public void setSellerId(long sellerId) {
+ public void setSellerId(Long sellerId) {
this.sellerId = sellerId;
}
@@ -240,11 +239,11 @@
this.shopTitle = shopTitle;
}
- public int getShopType() {
+ public Integer getShopType() {
return shopType;
}
- public void setShopType(int shopType) {
+ public void setShopType(Integer shopType) {
this.shopType = shopType;
}
@@ -256,28 +255,20 @@
this.couponId = couponId;
}
- public int getCouponSum() {
+ public Integer getCouponSum() {
return couponSum;
}
- public void setCouponSum(int couponSum) {
+ public void setCouponSum(Integer couponSum) {
this.couponSum = couponSum;
}
- public int getCouponCount() {
+ public Integer getCouponCount() {
return couponCount;
}
- public void setCouponCount(int couponCount) {
+ public void setCouponCount(Integer couponCount) {
this.couponCount = couponCount;
- }
-
- public long getCreatetime() {
- return createtime;
- }
-
- public void setCreatetime(long createtime) {
- this.createtime = createtime;
}
public String getCouponinfo() {
@@ -286,6 +277,30 @@
public void setCouponinfo(String couponinfo) {
this.couponinfo = couponinfo;
+ }
+
+ public BigDecimal getCouponStartFee() {
+ return couponStartFee;
+ }
+
+ public void setCouponStartFee(BigDecimal couponStartFee) {
+ this.couponStartFee = couponStartFee;
+ }
+
+ public BigDecimal getCouponAmount() {
+ return couponAmount;
+ }
+
+ public void setCouponAmount(BigDecimal couponAmount) {
+ this.couponAmount = couponAmount;
+ }
+
+ public BigDecimal getQuanPrice() {
+ return quanPrice;
+ }
+
+ public void setQuanPrice(BigDecimal quanPrice) {
+ this.quanPrice = quanPrice;
}
public String getCouponBegin() {
@@ -320,6 +335,38 @@
this.generalizeUrl = generalizeUrl;
}
+ public Integer getOrderby() {
+ return orderby;
+ }
+
+ public void setOrderby(Integer orderby) {
+ this.orderby = orderby;
+ }
+
+ public Long getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Long createtime) {
+ this.createtime = createtime;
+ }
+
+ public Integer getShowType() {
+ return showType;
+ }
+
+ public void setShowType(Integer showType) {
+ this.showType = showType;
+ }
+
+ public BigDecimal getHongbao() {
+ return hongbao;
+ }
+
+ public void setHongbao(BigDecimal hongbao) {
+ this.hongbao = hongbao;
+ }
+
@Override
public int hashCode() {
final int prime = 31;
--
Gitblit v1.8.0