From d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 11:59:18 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java b/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java
index e45e0d5..dc767ab 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.entity.system;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -12,12 +13,17 @@
*
*/
@Table("yeshi_ec_system_coupon")
-public class SystemCoupon {
+public class SystemCoupon implements Serializable{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
// 鍒哥被鍨�
public enum CouponTypeEnum {
- freeCoupon("鍏嶅崟"), welfareFreeCoupon("绂忓埄鍏嶅崟"), rebatePercentCoupon("杩斿埄姣旀彁鎴愬鍔卞埜");
-
+ freeCoupon("鍏嶅崟鍒�"), welfareFreeCoupon("绂忓埄鍏嶅崟"), rebatePercentCoupon("杩斿埄姣旀彁鎴愬鍔卞埜"),
+ freeCouponBuy("鑷喘鍏嶅崟鍒�"),freeCouponGive("璧犻�佸厤鍗曞埜");
private final String desc;
private CouponTypeEnum(String desc) {
@@ -68,13 +74,14 @@
@Column(name = "sc_rule")
private String rule;
+ // 瑙勫垯
+ @Column(name = "sc_rule_link")
+ private String ruleLink;
+
+
// 澶囨敞璇存槑
@Column(name = "sc_remark")
private String remark;
-
- // 棰嗗彇鏁伴噺
- @Column(name = "sc_receive_count")
- private Integer receiveCount;
// 鐘舵�� 0鏈惎鐢� 1宸插惎鐢�
@Column(name = "sc_state")
@@ -167,14 +174,6 @@
this.remark = remark;
}
- public Integer getReceiveCount() {
- return receiveCount;
- }
-
- public void setReceiveCount(Integer receiveCount) {
- this.receiveCount = receiveCount;
- }
-
public Integer getState() {
return state;
}
@@ -214,5 +213,13 @@
public void setPictureInvalid(String pictureInvalid) {
this.pictureInvalid = pictureInvalid;
}
+
+ public String getRuleLink() {
+ return ruleLink;
+ }
+
+ public void setRuleLink(String ruleLink) {
+ this.ruleLink = ruleLink;
+ }
}
--
Gitblit v1.8.0