记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit fd8cfb6b authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

积分抽奖 活动表 奖品表整理完毕

parent 17b80e87
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 39 deletions
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/admin/SweetIntegralActivityFromParam.java
View file @ fd8cfb6b
......@@ -50,6 +50,10 @@ public class SweetIntegralActivityFromParam implements Serializable, Cloneable {
@NotNull(message = "activityNum不能为空")
private Integer activityNum;
@ApiModelProperty(required = true, value = "预估玩此活动的总人数", example = "1")
@NotNull(message = "estimatedNum不能为空")
private Integer estimatedNum;
@ApiModelProperty(required = true, value = "活动时间类型 1长期 2开始结束时间", example = "1")
@NotNull(message = "timeType不能为空") @Min(value = 1, message = "timeType无效") @Max(value = 2, message = "timeType无效")
private Integer timeType;
......@@ -68,6 +72,10 @@ public class SweetIntegralActivityFromParam implements Serializable, Cloneable {
@NotBlank(message = "activityTitle不能为空")
private String activityRules;
@ApiModelProperty(required = true, value = "概率公示", example = "这里是概率公示")
@NotBlank(message = "probabilityPublicity不能为空")
private String probabilityPublicity;
@ApiModelProperty(required = true, value = "是否上线 1未上线 2已上线", example = "2")
@NotNull(message = "isOnline不能为空") @Min(value = 1, message = "isOnline无效") @Max(value = 2, message = "isOnline无效")
private Integer isOnline;
......@@ -95,6 +103,7 @@ public class SweetIntegralActivityFromParam implements Serializable, Cloneable {
sweetIntegralActivity.setActivityImg(source.getActivityImg());
sweetIntegralActivity.setActivityType(source.getActivityType());
sweetIntegralActivity.setActivityNum(source.getActivityNum());
sweetIntegralActivity.setEstimatedNum(source.getEstimatedNum());
sweetIntegralActivity.setTimeType(source.getTimeType());
if (null != source.getStartTime() && !source.getStartTime().isEmpty()) {
LocalDateTime startTime = DateUtil.Formatter.yyyyMMddHHmmss.parse(source.getStartTime());
......@@ -106,6 +115,7 @@ public class SweetIntegralActivityFromParam implements Serializable, Cloneable {
}
sweetIntegralActivity.setExpressFeeType(source.getExpressFeeType());
sweetIntegralActivity.setActivityRules(source.getActivityRules());
sweetIntegralActivity.setProbabilityPublicity(source.getProbabilityPublicity());
sweetIntegralActivity.setIsOnline(source.getIsOnline());
return sweetIntegralActivity;
}
......
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/admin/SweetIntegralActivityPrizeFormParam.java
View file @ fd8cfb6b
......@@ -35,6 +35,10 @@ public class SweetIntegralActivityPrizeFormParam implements Serializable,Cloneab
@NotBlank(message = "prizeTitle不能为空")
private String prizeTitle;
@ApiModelProperty(required = true, value = "奖品描述", example = "奖品描述")
@NotBlank(message = "prizeDescribe不能为空")
private String prizeDescribe;
@ApiModelProperty(required = true, value = "初始展示奖品图片", example = "test.png")
@NotBlank(message = "prizeImgInit不能为空")
private String prizeImgInit;
......@@ -43,24 +47,17 @@ public class SweetIntegralActivityPrizeFormParam implements Serializable,Cloneab
@NotBlank(message = "prizeImgSelect不能为空")
private String prizeImgSelect;
@ApiModelProperty(required = true, value = "奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物", example = "1")
@ApiModelProperty(required = true, value = "奖品类型 1积分 2优惠券 3实物 4登登登VIP", example = "1")
@NotNull(message = "prizeType不能为空")
private Integer prizeType;
@ApiModelProperty(required = false, value = "单次奖励数量如积分 中奖给多少物", example = "1")
private Integer prizeTypeNum;
@ApiModelProperty(value = "关联id 如商品id 券id 选择奖品的时候必传", example = "429803743878963206506461")
private String relationId;
@ApiModelProperty(required = true, value = "奖品数量", example = "100")
@NotNull(message = "prizeNum不能为空")
private Integer prizeNum;
@ApiModelProperty(required = true, value = "限制的中奖人数", example = "10")
@NotNull(message = "winnersNum不能为空")
private Integer winnersNum;
@ApiModelProperty(required = true, value = "中奖概率", example = "1")
@NotNull(message = "winningProbability不能为空")
private BigDecimal winningProbability;
......@@ -81,13 +78,12 @@ public class SweetIntegralActivityPrizeFormParam implements Serializable,Cloneab
sweetIntegralActivityPrize.setIntegralActivityId(source.getIntegralActivityId());
sweetIntegralActivityPrize.setPrizeId(source.getPrizeId());
sweetIntegralActivityPrize.setPrizeTitle(source.getPrizeTitle());
sweetIntegralActivityPrize.setPrizeDescribe(source.getPrizeDescribe());
sweetIntegralActivityPrize.setPrizeImgInit(source.getPrizeImgInit());
sweetIntegralActivityPrize.setPrizeImgSelect(source.getPrizeImgSelect());
sweetIntegralActivityPrize.setPrizeType(source.getPrizeType());
sweetIntegralActivityPrize.setPrizeTypeNum(source.getPrizeTypeNum());
sweetIntegralActivityPrize.setRelationId(source.getRelationId());
sweetIntegralActivityPrize.setPrizeNum(source.getPrizeNum());
sweetIntegralActivityPrize.setWinnersNum(source.getWinnersNum());
sweetIntegralActivityPrize.setWinningProbability(source.getWinningProbability());
return sweetIntegralActivityPrize;
}
......
liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetIntegralActivity.java
View file @ fd8cfb6b
......@@ -51,6 +51,11 @@ public class SweetIntegralActivity implements Serializable, Cloneable {
*/
private Integer activityNum;
/**
* 预估玩此活动的总人数
*/
private Integer estimatedNum;
/**
* 活动时间类型 1长期 2开始结束时间
*/
......@@ -76,6 +81,11 @@ public class SweetIntegralActivity implements Serializable, Cloneable {
*/
private String activityRules;
/**
* 概率公示
*/
private String probabilityPublicity;
/**
* 是否上线 1未上线 2已上线
*/
......
liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetIntegralActivityPrize.java
View file @ fd8cfb6b
......@@ -43,6 +43,11 @@ public class SweetIntegralActivityPrize implements Serializable, Cloneable {
*/
private String prizeTitle;
/**
* 奖品描述
*/
private String prizeDescribe;
/**
* 初始展示奖品图片
*/
......@@ -54,7 +59,7 @@ public class SweetIntegralActivityPrize implements Serializable, Cloneable {
private String prizeImgSelect;
/**
* 奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物
* 奖品类型 1积分 2优惠券 3实物 4登登登VIP
*/
private Integer prizeType;
......@@ -63,21 +68,11 @@ public class SweetIntegralActivityPrize implements Serializable, Cloneable {
*/
private Integer prizeTypeNum;
/**
* 关联id 如商品id 券id
*/
private String relationId;
/**
* 奖品数量
*/
private Integer prizeNum;
/**
* 限制的中奖人数
*/
private Integer winnersNum;
/**
* 中奖概率
*/
......
liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweet_integral_activity_20211020.sql
View file @ fd8cfb6b
......@@ -8,11 +8,13 @@ CREATE TABLE `sweet_integral_activity`
`activity_img` varchar(255) NOT NULL DEFAULT '' COMMENT '活动图片',
`activity_type` tinyint NOT NULL DEFAULT 0 COMMENT '活动类型 1转盘',
`activity_num` int NOT NULL DEFAULT 0 COMMENT '活动玩一次所需积分',
`estimated_num` int NOT NULL DEFAULT 0 COMMENT '预估玩此活动的总人数',
`time_type` tinyint NOT NULL DEFAULT 0 COMMENT '活动时间类型 1长期 2开始结束时间',
`start_time` datetime NULL DEFAULT NULL COMMENT '如果活动有时间限制 开始时间',
`end_time` datetime NULL DEFAULT NULL COMMENT '如果活动有时间限制 结束时间',
`express_fee_type` tinyint NOT NULL DEFAULT 0 COMMENT '快递费用类型 1包邮 2到付',
`activity_rules` text NULL DEFAULT NULL COMMENT '活动规则',
`probability_publicity` text NULL DEFAULT NULL COMMENT '概率公示',
`is_online` tinyint NOT NULL DEFAULT 0 COMMENT '是否上线 1未上线 2已上线',
`created_at` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
......@@ -32,13 +34,12 @@ CREATE TABLE `sweet_integral_activity_prize`
`prize_id` varchar(255) NOT NULL DEFAULT '' COMMENT '奖品id',
`integral_activity_id` varchar(255) NOT NULL DEFAULT '' COMMENT '关联活动id',
`prize_title` varchar(255) NOT NULL DEFAULT '' COMMENT '奖品名称',
`prize_describe` varchar(255) NOT NULL DEFAULT '' COMMENT '奖品描述',
`prize_img_init` varchar(255) NOT NULL DEFAULT '' COMMENT '初始展示奖品图片',
`prize_img_select` varchar(255) NOT NULL DEFAULT '' COMMENT '中奖选中奖品图片',
`prize_type` tinyint NOT NULL DEFAULT 0 COMMENT '奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物',
`relation_id` varchar(255) NOT NULL DEFAULT '' COMMENT '关联id 如商品id 券id',
`prize_type` tinyint NOT NULL DEFAULT 0 COMMENT '奖品类型 1积分 2优惠券 3实物 4登登登VIP',
`prize_type_num` int NOT NULL DEFAULT 0 COMMENT '单次奖励数量如积分 中奖给多少',
`prize_num` int NOT NULL DEFAULT 0 COMMENT '奖品数量',
`winners_num` int NOT NULL DEFAULT 0 COMMENT '限制的中奖人数',
`prize_num` int NOT NULL DEFAULT 0 COMMENT '奖品数量库存',
`winning_probability` decimal(10, 2) NOT NULL DEFAULT 0 COMMENT '中奖概率',
`created_at` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment