From 5394194396290aa232910a571d6f4ef463a92a6b Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Wed, 07 Apr 2021 11:23:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignAwardSet.java | 41 ++++++++++++++++++++++++++++++++--------- 1 files changed, 32 insertions(+), 9 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 a1c7bf9..ccfea36 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.matrix.core.anotations.Extend; import com.matrix.system.score.entity.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -26,35 +27,45 @@ * 奖项类型（1：自定义产品2：积分3：优惠券4：店铺商品） */ - + @ApiModelProperty(value ="奖项类型（1：自定义产品2：积分3：优惠券4：店铺商品）") private int awardType; + + + public static final int AWARDTYPE_CUSTOMIZE = 1; + public static final int AWARDTYPE_SCORE = 2; + public static final int AWARDTYPE_COUPON = 3; + public static final int AWARDTYPE_GOODS = 4; /** * 奖项规则（1：每日奖励（默认）2：累计签到天数） */ + @ApiModelProperty(value ="奖项规则（1：每日奖励（默认）2：累计签到天数）") private int awardRule; + + public static final int AWARDRULE_NORMAL = 1; + public static final int AWARDRULE_CUMULATIVEDAY = 2; /** * 签到累计天数 */ - + @ApiModelProperty(value ="签到累计天数") private int cumulativeDay; /** * 奖项名称 */ - + @ApiModelProperty(value ="奖项名称") private String awardName; /** * 图片介绍 */ - + @ApiModelProperty(value ="图片介绍") private String introduceImg; /** @@ -62,6 +73,7 @@ */ + @ApiModelProperty(value ="文字介绍") private String introduceTip; /** @@ -69,6 +81,7 @@ */ + @ApiModelProperty(value ="奖项库存数量") private int awardInventoryCnt; /** @@ -76,6 +89,7 @@ */ + @ApiModelProperty(value ="已派发数量") private int awardDistributeCnt; /** @@ -83,11 +97,13 @@ */ + @ApiModelProperty(value ="兑奖方式（1：线下兑换2：物流配送3：客服兑换）") private int awardWay; /** * 奖品是否有效（1：有效 2：无效） */ + @ApiModelProperty(value ="奖品是否有效（1：有效 2：无效）") private int awardState; public static final int AWARDSTATE_WORK = 1; public static final int AWARDSTATE_UNWORK = 2; @@ -96,14 +112,14 @@ * 操作提示 */ - + @ApiModelProperty(value ="操作提示") private String operationTip; /** * 兑奖地址 */ - + @ApiModelProperty(value ="兑奖地址") private String prizeAddress; /** @@ -111,20 +127,21 @@ */ + @ApiModelProperty(value ="兑奖期限开始日期") private Date prizeStartTime; /** * 兑奖期限结束日期 */ - + @ApiModelProperty(value ="兑奖期限结束日期") private Date prizeEndTime; /** * 客服微信 */ - + @ApiModelProperty(value ="客服微信") private String wechatImg; /** @@ -132,23 +149,27 @@ */ + @ApiModelProperty(value ="积分数量") private int scoreCnt; /** * 优惠券ID */ - + @ApiModelProperty(value ="优惠券") private String couponName; + @ApiModelProperty(value ="优惠券ID") private String couponId; /** * 商品ID */ + @ApiModelProperty(value ="商品") private String goodsName; + @ApiModelProperty(value ="商品ID") private String goodsId; /** @@ -156,6 +177,7 @@ */ + @ApiModelProperty(value ="活动主表ID") private Long activityId; /** @@ -163,6 +185,7 @@ */ + @ApiModelProperty(value ="公司ID") private Long companyId; -- Gitblit v1.9.1