From 207dc8655711cddac2653e18b51e58a88dba2084 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 06 三月 2020 18:14:36 +0800
Subject: [PATCH] 发圈处理
---
fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 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 7888a81..9af0e59 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
@@ -22,8 +22,8 @@
// 鍒哥被鍨�
public enum CouponTypeEnum {
- freeCoupon("鍏嶅崟"), welfareFreeCoupon("绂忓埄鍏嶅崟"), rebatePercentCoupon("杩斿埄姣旀彁鎴愬鍔卞埜");
-
+ freeCoupon("鍏嶅崟鍒�"), welfareFreeCoupon("绂忓埄鍏嶅崟"), rebatePercentCoupon("杩斿埄姣旀彁鎴愬鍔卞埜"),
+ freeCouponBuy("鑷喘鍏嶅崟鍒�"),freeCouponGive("璧犻�佸厤鍗曞埜");
private final String desc;
private CouponTypeEnum(String desc) {
@@ -66,21 +66,26 @@
@Column(name = "sc_amount")
private String amount;
+ // 鏈夋晥鏈熷ぉ-鍓╀綑婵�娲绘椂闂�
+ @Column(name = "sc_activate_day")
+ private Integer activateDay;
+
// 鏈夋晥鏈熷ぉ鏁�
@Column(name = "sc_expiry_day")
private Integer expiryDay;
-
+
// 瑙勫垯
@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")
@@ -173,14 +178,6 @@
this.remark = remark;
}
- public Integer getReceiveCount() {
- return receiveCount;
- }
-
- public void setReceiveCount(Integer receiveCount) {
- this.receiveCount = receiveCount;
- }
-
public Integer getState() {
return state;
}
@@ -220,5 +217,20 @@
public void setPictureInvalid(String pictureInvalid) {
this.pictureInvalid = pictureInvalid;
}
-
+
+ public String getRuleLink() {
+ return ruleLink;
+ }
+
+ public void setRuleLink(String ruleLink) {
+ this.ruleLink = ruleLink;
+ }
+
+ public Integer getActivateDay() {
+ return activateDay;
+ }
+
+ public void setActivateDay(Integer activateDay) {
+ this.activateDay = activateDay;
+ }
}
--
Gitblit v1.8.0