From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 17 一月 2025 16:40:43 +0800 Subject: [PATCH] bug修改 --- ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtCouponEditDto.java | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtCouponEditDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtCouponEditDto.java index 8d325e9..c70fd6f 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtCouponEditDto.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtCouponEditDto.java @@ -1,9 +1,11 @@ package com.ruoyi.member.domain.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.system.api.domain.dto.MgtBaseDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -21,19 +23,27 @@ @ApiModelProperty(value = "优惠券id 新增不传") private String couponId; - @ApiModelProperty("优惠券类型1.满减2.折扣3.代金4.商品") + @ApiModelProperty(value="优惠券类型1.满减2.折扣3.代金4.商品") + @NotNull(message = "优惠券类型不能为空") private Integer couponType; - @ApiModelProperty("优惠券名称") + @ApiModelProperty(value="优惠券名称") + @NotNull(message = "优惠券名称不能为空") private String couponName; - @ApiModelProperty(value = "发送类型1.手动领取2.全部用户3.会员用户4非会员用户5自定义") + @ApiModelProperty(value = "发送类型1.手动领取2.指定发放") + @NotNull(message = "发送类型不能为空") private Integer sendType; - @ApiModelProperty("发送时间类型1立即2定时") + @ApiModelProperty(value = "发送对象2.全部用户3.会员用户4非会员用户5自定义") + @NotNull(message = "发送对象不能为空") + private Integer sendTarget; + + @ApiModelProperty(value="发送时间类型1立即2定时") private Integer sendTimeType; - @ApiModelProperty("发送时间") + @ApiModelProperty(value="发送时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date sendTime; @ApiModelProperty(value = "使用范围1.全场2.指定商品") @@ -66,9 +76,24 @@ @ApiModelProperty(value = "关联类型1.用户管理筛选2.活动管理筛选") private Integer relationType; + @ApiModelProperty(value = "关联活动类型1秒杀活动") + private Integer relationActivityType; + @ApiModelProperty(value = "关联活动id") private String relationActivityId; @ApiModelProperty(value = "关联用户id集合") private List<Long> relUserIdList; + + @ApiModelProperty(value = "宣传海报") + private String propagandaPoster; + + @ApiModelProperty(value = "发放限制数量") + private Integer sendLimitNumber; + + @ApiModelProperty(value = "发放限制0否1是") + private Integer sendLimitFlag; + + @ApiModelProperty(value = "领取限制数量 0为不限") + private Integer limitNumber; } -- Gitblit v1.7.1