From 30c2ee7f4e4404063f99b7d6b8d05e5d4cd51e21 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 06 Apr 2021 18:29:30 +0800 Subject: [PATCH] modify --- zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignAwardSet.java | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignAwardSet.java b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignAwardSet.java index 7c153df..a1c7bf9 100644 --- a/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignAwardSet.java +++ b/zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignAwardSet.java @@ -27,21 +27,21 @@ */ - private Integer awardType; + private int awardType; /** * 奖项规则（1：每日奖励（默认）2：累计签到天数） */ - private Integer awardRule; + private int awardRule; /** * 签到累计天数 */ - private Integer cumulativeDay; + private int cumulativeDay; /** * 奖项名称 @@ -69,21 +69,28 @@ */ - private Integer awardInventoryCnt; + private int awardInventoryCnt; /** * 已派发数量 */ - private Integer awardDistributeCnt; + private int awardDistributeCnt; /** * 兑奖方式（1：线下兑换2：物流配送3：客服兑换） */ - private Integer awardWay; + private int awardWay; + + /** + * 奖品是否有效（1：有效 2：无效） + */ + private int awardState; + public static final int AWARDSTATE_WORK = 1; + public static final int AWARDSTATE_UNWORK = 2; /** * 操作提示 @@ -125,12 +132,14 @@ */ - private Integer scoreCnt; + private int scoreCnt; /** * 优惠券ID */ + + private String couponName; private String couponId; @@ -138,6 +147,7 @@ * 商品ID */ + private String goodsName; private String goodsId; -- Gitblit v1.9.1