From 2c13cc4cad9ad9a4543154b2f3e4fa6b2c387807 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Tue, 24 Jun 2025 22:41:43 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E8=B4=AD=E4=B9=B0=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E8=90=A5=E9=94=80=E8=B0=83=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/vo/advertRound/AdRoundLatestVO.java | 8 ++++---- .../xkt/vo/advertRound/AdRoundStoreCreateVO.java | 14 +++++++------- .../xkt/vo/advertRound/AdRoundUpdateVO.java | 4 ++-- .../xkt/vo/advertRound/AdvertRoundStorePageVO.java | 4 ++-- .../xkt/service/impl/AdvertRoundServiceImpl.java | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundLatestVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundLatestVO.java index cb7e92acb..5fe3a2228 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundLatestVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundLatestVO.java @@ -20,16 +20,16 @@ import javax.validation.constraints.NotNull; public class AdRoundLatestVO { @NotNull(message = "档口ID不能为空!") - @ApiModelProperty(value = "档口ID") + @ApiModelProperty(value = "档口ID", required = true) private Long storeId; @NotNull(message = "广告类型ID不能为空!") - @ApiModelProperty(value = "广告类型ID") + @ApiModelProperty(value = "广告类型ID", required = true) private Long advertId; @NotNull(message = "播放轮次ID不能为空!") - @ApiModelProperty(value = "播放轮次ID") + @ApiModelProperty(value = "播放轮次ID", required = true) private Integer roundId; @NotNull(message = "展示类型不能为空!") - @ApiModelProperty(value = "展示类型 时间范围 位置枚举") + @ApiModelProperty(value = "展示类型 时间范围 位置枚举", required = true) private Integer showType; @ApiModelProperty(value = "位置 A B C D E") private String position; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundStoreCreateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundStoreCreateVO.java index ccdb33d39..7e4405d8d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundStoreCreateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundStoreCreateVO.java @@ -22,31 +22,31 @@ import java.math.BigDecimal; public class AdRoundStoreCreateVO { @NotNull(message = "广告ID不能为空!") - @ApiModelProperty(value = "广告ID") + @ApiModelProperty(value = "广告ID", required = true) private Long advertId; @NotNull(message = "广告轮次ID不能为空!") - @ApiModelProperty(value = "广告轮次ID") + @ApiModelProperty(value = "广告轮次ID", required = true) private Long roundId; @NotNull(message = "推广展示类型不能为空!") - @ApiModelProperty(value = "推广展示类型 时间范围 位置枚举") + @ApiModelProperty(value = "推广展示类型", required = true) private Integer showType; @ApiModelProperty(value = "[不一定传]广告位置 A B C D E") private String position; @NotNull(message = "推广档口ID不能为空!") - @ApiModelProperty(value = "推广档口ID") + @ApiModelProperty(value = "推广档口ID", required = true) private Long storeId; @NotNull(message = "推广档口出价不能为空!") - @ApiModelProperty(value = "推广档口出价") + @ApiModelProperty(value = "推广档口出价", required = true) private BigDecimal payPrice; @ApiModelProperty(value = "图片设计（1 自主设计、2 平台设计）") private Integer picDesignType; @ApiModelProperty(value = "推广商品ID列表") private String prodIdStr; @NotBlank(message = "对象锁符号不能为空!") - @ApiModelProperty(value = "对象锁符号") + @ApiModelProperty(value = "对象锁符号", required = true) private String symbol; @NotBlank(message = "交易密码不能为空!") - @ApiModelProperty(value = "交易密码") + @ApiModelProperty(value = "交易密码", required = true) private String transactionPassword; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundUpdateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundUpdateVO.java index c87e45277..eef1b52c2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundUpdateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundUpdateVO.java @@ -21,10 +21,10 @@ import java.math.BigDecimal; public class AdRoundUpdateVO { @NotNull(message = "推广轮次ID不能为空!") - @ApiModelProperty(value = "推广轮次ID") + @ApiModelProperty(value = "推广轮次ID", required = true) private Long advertRoundId; @NotNull(message = "档口ID不能为空!") - @ApiModelProperty(value = "档口ID") + @ApiModelProperty(value = "档口ID", required = true) private Long storeId; @ApiModelProperty(value = "推广图") private ARUFileVO file; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdvertRoundStorePageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdvertRoundStorePageVO.java index c7bcfe38b..f4d8132d6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdvertRoundStorePageVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdvertRoundStorePageVO.java @@ -21,7 +21,7 @@ import java.util.List; public class AdvertRoundStorePageVO extends BasePageVO { @NotNull(message = "档口ID不能为空!") - @ApiModelProperty(value = "档口ID") + @ApiModelProperty(value = "档口ID", required = true) private Long storeId; @ApiModelProperty(value = "平台ID") private Long platformId; @@ -30,7 +30,7 @@ public class AdvertRoundStorePageVO extends BasePageVO { @ApiModelProperty(value = "投放状态") private Integer launchStatus; @NotNull(message = "竞价状态不能为空!") - @ApiModelProperty(value = "竞价状态 只查看 已出价 或 竞价成功的状态") + @ApiModelProperty(value = "竞价状态 只查看 已出价 或 竞价成功的状态", required = true) private List biddingStatusList; @ApiModelProperty(value = "图片是否设置 1 未设置 2已设置") private Integer picSetType; diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java index 0a9ddb532..7a50c31cf 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java @@ -582,7 +582,7 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService { public Integer create(AdRoundStoreCreateDTO createDTO) { // 判断截止时间是否超时，并且只会处理马上播放的这一轮。比如 5.1-5.3，当前为4.30，处理这一轮；当前为5.2，处理这一轮；当前为5.3（最后一天），处理下一轮。 if (DateUtils.getTime().compareTo(this.getDeadline(createDTO.getSymbol())) > 0) { - throw new ServiceException("竞价失败，已经有档口出价更高了噢!", HttpStatus.ERROR); + throw new ServiceException("竞价失败，已过系统截止时间!", HttpStatus.ERROR); } Store store = redisCache.getCacheObject(CacheConstants.STORE_KEY + createDTO.getStoreId()); if (ObjectUtils.isEmpty(store)) {