From 5ef0e1ef5c17f0e44aaee924e8547439df55b97b Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Thu, 21 Aug 2025 15:11:16 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=8E=A8=E5=B9=BF=E8=90=A5?= =?UTF-8?q?=E9=94=80=E4=BC=98=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/vo/advertRound/AdRoundTypeRoundResVO.java | 2 ++ .../ruoyi/xkt/dto/advertRound/AdRoundTypeRoundResDTO.java | 2 ++ .../com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundTypeRoundResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundTypeRoundResVO.java index 018086bab..fbf23ff41 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundTypeRoundResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundTypeRoundResVO.java @@ -41,6 +41,8 @@ public class AdRoundTypeRoundResVO { private BigDecimal startPrice; @ApiModelProperty(value = "对象锁符号") private String symbol; + @ApiModelProperty(value = "当前播放状态") + private Integer launchStatus; @ApiModelProperty(value = "竞价状态") private Integer biddingStatus; @ApiModelProperty(value = "竞价状态名称") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundTypeRoundResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundTypeRoundResDTO.java index 0c55698e6..a0f082a80 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundTypeRoundResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundTypeRoundResDTO.java @@ -43,6 +43,8 @@ public class AdRoundTypeRoundResDTO { private BigDecimal startPrice; @ApiModelProperty(value = "对象锁符号") private String symbol; + @ApiModelProperty(value = "当前播放状态") + private Integer launchStatus; @ApiModelProperty(value = "竞价状态") private Integer biddingStatus; @ApiModelProperty(value = "竞价状态名称") 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 5f3c23c2b..9320bdedb 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 @@ -225,9 +225,9 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService { AdvertRound advertRound = list.get(0); Integer durationDay = calculateDurationDay(advertRound.getStartTime(), advertRound.getEndTime(), Boolean.TRUE); AdRoundTypeRoundResDTO typeRoundResDTO = new AdRoundTypeRoundResDTO().setAdvertId(advertRound.getAdvertId()).setRoundId(advertRound.getRoundId()) - .setSymbol(advertRound.getSymbol()).setStartTime(advertRound.getStartTime()).setEndTime(advertRound.getEndTime()) - .setStartWeekDay(getDayOfWeek(advertRound.getStartTime())).setEndWeekDay(getDayOfWeek(advertRound.getEndTime())) - .setShowType(advertRound.getShowType()).setPosition(advertRound.getPosition()).setDurationDay(durationDay); + .setSymbol(advertRound.getSymbol()).setLaunchStatus(advertRound.getLaunchStatus()).setStartTime(advertRound.getStartTime()) + .setEndTime(advertRound.getEndTime()).setStartWeekDay(getDayOfWeek(advertRound.getStartTime())).setDurationDay(durationDay) + .setEndWeekDay(getDayOfWeek(advertRound.getEndTime())).setShowType(advertRound.getShowType()).setPosition(advertRound.getPosition()); // 如果是播放论，则播放开始时间展示为当天，因为有可能是播放的中间某一天 if (Objects.equals(advertRound.getRoundId(), AdRoundType.PLAY_ROUND.getValue())) { Date tomorrow = Date.from(LocalDate.now().plusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant());