From 9d35ba657fa5e3add766405d76e3ff8c4dcd4ad4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 15:38:00 +0800
Subject: [PATCH] 多系统兼容优化
---
fanli/src/main/java/com/yeshi/fanli/entity/push/PushCoupon.java | 274 ++++++++++++++++++++++++++++--------------------------
1 files changed, 143 insertions(+), 131 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/push/PushCoupon.java b/fanli/src/main/java/com/yeshi/fanli/entity/push/PushCoupon.java
index cb3a4c3..50b8bc2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/push/PushCoupon.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/push/PushCoupon.java
@@ -3,6 +3,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import com.yeshi.fanli.entity.SystemEnum;
import org.springframework.format.annotation.DateTimeFormat;
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
@@ -10,178 +11,189 @@
@Table("yeshi_ec_push_coupon")
public class PushCoupon {
- @Column(name = "pc_id")
- private Long id;
+ @Column(name = "pc_id")
+ private Long id;
- // 鏄剧ず鏍囬
- @Column(name = "pc_title")
- private String title;
+ // 鏄剧ず鏍囬
+ @Column(name = "pc_title")
+ private String title;
- // 鏄剧ず鍐呭
- @Column(name = "pc_content")
- private String content;
+ // 鏄剧ず鍐呭
+ @Column(name = "pc_content")
+ private String content;
- // 鍒告暟閲�
- @Column(name = "pc_amount")
- private Integer amount;
+ // 鍒告暟閲�
+ @Column(name = "pc_amount")
+ private Integer amount;
- // 鍒告瘮渚�
- @Column(name = "pc_percent")
- private BigDecimal percent;
+ // 鍒告瘮渚�
+ @Column(name = "pc_percent")
+ private BigDecimal percent;
- // 鍗曟帹鐢ㄦ埛id锛屽绉焛d
- @Column(name = "pc_uids")
- private String uids;
+ // 鍗曟帹鐢ㄦ埛id锛屽绉焛d
+ @Column(name = "pc_uids")
+ private String uids;
- // 鐗堟湰鍙�
- @Column(name = "pc_versions")
- private String versions;
-
- // 鍗曟帹鐢ㄦ埛id
- @Column(name = "pc_remark")
- private String remark;
+ // 鐗堟湰鍙�
+ @Column(name = "pc_versions")
+ private String versions;
- // 璧峰鏃堕棿
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Column(name = "pc_start_time")
- private Date startTime;
+ // 鍗曟帹鐢ㄦ埛id
+ @Column(name = "pc_remark")
+ private String remark;
- // 缁撴潫鏃堕棿
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Column(name = "pc_end_time")
- private Date endTime;
+ // 璧峰鏃堕棿
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Column(name = "pc_start_time")
+ private Date startTime;
- // 鏄惁宸叉帹閫�
- @Column(name = "pc_pushed")
- private boolean pushed;
+ // 缁撴潫鏃堕棿
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Column(name = "pc_end_time")
+ private Date endTime;
- // 鎺ㄩ�佹椂闂�
- @Column(name = "pc_push_time")
- private Date pushTime;
+ // 鏄惁宸叉帹閫�
+ @Column(name = "pc_pushed")
+ private boolean pushed;
- @Column(name = "pc_create_time")
- private Date createTime;
+ // 鎺ㄩ�佹椂闂�
+ @Column(name = "pc_push_time")
+ private Date pushTime;
- @Column(name = "pc_update_time")
- private Date updateTime;
+ @Column(name = "pc_create_time")
+ private Date createTime;
- public PushCoupon() {
- }
+ @Column(name = "pc_update_time")
+ private Date updateTime;
- public PushCoupon(Long id) {
- this.id = id;
- }
+ @Column(name = "pc_system")
+ private SystemEnum system;
- public Long getId() {
- return id;
- }
+ public SystemEnum getSystem() {
+ return system;
+ }
- public void setId(Long id) {
- this.id = id;
- }
+ public void setSystem(SystemEnum system) {
+ this.system = system;
+ }
- public String getTitle() {
- return title;
- }
+ public PushCoupon() {
+ }
- public void setTitle(String title) {
- this.title = title;
- }
+ public PushCoupon(Long id) {
+ this.id = id;
+ }
- public String getContent() {
- return content;
- }
+ public Long getId() {
+ return id;
+ }
- public void setContent(String content) {
- this.content = content;
- }
+ public void setId(Long id) {
+ this.id = id;
+ }
- public Integer getAmount() {
- return amount;
- }
+ public String getTitle() {
+ return title;
+ }
- public void setAmount(Integer amount) {
- this.amount = amount;
- }
+ public void setTitle(String title) {
+ this.title = title;
+ }
- public BigDecimal getPercent() {
- return percent;
- }
+ public String getContent() {
+ return content;
+ }
- public void setPercent(BigDecimal percent) {
- this.percent = percent;
- }
+ public void setContent(String content) {
+ this.content = content;
+ }
- public String getUids() {
- return uids;
- }
+ public Integer getAmount() {
+ return amount;
+ }
- public void setUids(String uids) {
- this.uids = uids;
- }
+ public void setAmount(Integer amount) {
+ this.amount = amount;
+ }
- public String getRemark() {
- return remark;
- }
+ public BigDecimal getPercent() {
+ return percent;
+ }
- public void setRemark(String remark) {
- this.remark = remark;
- }
+ public void setPercent(BigDecimal percent) {
+ this.percent = percent;
+ }
- public Date getStartTime() {
- return startTime;
- }
+ public String getUids() {
+ return uids;
+ }
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
+ public void setUids(String uids) {
+ this.uids = uids;
+ }
- public Date getEndTime() {
- return endTime;
- }
+ public String getRemark() {
+ return remark;
+ }
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
- public boolean isPushed() {
- return pushed;
- }
+ public Date getStartTime() {
+ return startTime;
+ }
- public void setPushed(boolean pushed) {
- this.pushed = pushed;
- }
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
- public Date getPushTime() {
- return pushTime;
- }
+ public Date getEndTime() {
+ return endTime;
+ }
- public void setPushTime(Date pushTime) {
- this.pushTime = pushTime;
- }
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
- public Date getCreateTime() {
- return createTime;
- }
+ public boolean isPushed() {
+ return pushed;
+ }
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
+ public void setPushed(boolean pushed) {
+ this.pushed = pushed;
+ }
- public Date getUpdateTime() {
- return updateTime;
- }
+ public Date getPushTime() {
+ return pushTime;
+ }
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
+ public void setPushTime(Date pushTime) {
+ this.pushTime = pushTime;
+ }
- public String getVersions() {
- return versions;
- }
+ public Date getCreateTime() {
+ return createTime;
+ }
- public void setVersions(String versions) {
- this.versions = versions;
- }
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getVersions() {
+ return versions;
+ }
+
+ public void setVersions(String versions) {
+ this.versions = versions;
+ }
}
--
Gitblit v1.8.0