From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtCouponEditDto.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 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 2096001..5bebd1f 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,10 +1,13 @@
package com.ruoyi.member.domain.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.api.domain.dto.MgtBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+import javax.validation.constraints.AssertTrue;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
@@ -25,13 +28,14 @@
@ApiModelProperty(value="优惠券类型1.满减2.折扣3.代金4.商品")
@NotNull(message = "优惠券类型不能为空")
+ @Range(min = 1, max = 4 , message = "优惠券类型错误")
private Integer couponType;
@ApiModelProperty(value="优惠券名称")
@NotNull(message = "优惠券名称不能为空")
private String couponName;
- @ApiModelProperty(value = "发送类型1.手动领取2.指定发放")
+ @ApiModelProperty(value = "发送类型1.手动领取2.指定发放3.抽奖领取")
@NotNull(message = "发送类型不能为空")
private Integer sendType;
@@ -50,6 +54,7 @@
private Integer useScope;
@ApiModelProperty(value = "有效期类型1.时间段2.领取之日起")
+ @Range(min = 1, max = 2, message = "有效期类型只能是1或2")
private Integer validTimeType;
@ApiModelProperty(value = "有效开始时间")
@@ -84,4 +89,40 @@
@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;
+
+ @ApiModelProperty("分享文案")
+ private String sharePassage;
+
+ @ApiModelProperty("分享图片")
+ private String sharePic;
+ // 自定义校验逻辑
+ @AssertTrue(message = "当有效期类型为时间段时，有效开始时间和有效截止时间不能为空")
+ public boolean isValidTimeRange() {
+ if (validTimeType == null) return true; // 由@NotNull校验
+ if (validTimeType == 1) {
+ return validStartTime != null && validEndTime != null;
+ }
+ return true;
+ }
+
+ @AssertTrue(message = "当有效期类型为领取之日起时，有效期不能为空且必须大于0")
+ public boolean isValidDay() {
+ if (validTimeType == null) return true;
+ if (validTimeType == 2) {
+ return validDay != null && validDay > 0;
+ }
+ return true;
+ }
}
--
Gitblit v1.7.1