From 83d4d9c7bf01c6d0f1298bc820397923edb299e7 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Thu, 13 Nov 2025 21:21:21 +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=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/web/controller/common/CommonController.java | 4 ++-- .../controller/xkt/vo/advertRound/AdRoundTypeRoundResVO.java | 2 -- .../com/ruoyi/xkt/dto/advertRound/AdRoundTypeRoundResDTO.java | 2 -- .../com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index 7d402571d..9a3ec880a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -236,9 +236,9 @@ public class CommonController { } public static void main(String[] args) { - String str = FileUtil.readString("C:\\Users\\123\\Desktop\\privacyPolicy(1).html", Charset.forName("UTF-8")); + String str = FileUtil.readString("C:\\Users\\123\\Desktop\\步橘网总则.html", Charset.forName("UTF-8")); Map json = new HashMap<>(); - json.put("title", "aaa"); + json.put("title", "generalRules"); json.put("content", str); System.out.println(JSONUtil.toJsonStr(json)); } 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 bc113d76e..bc920b8c3 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 @@ -21,8 +21,6 @@ public class AdRoundTypeRoundResVO { private Long advertId; @ApiModelProperty(value = "广告轮次ID") private Integer roundId; - @ApiModelProperty(value = "播放数量") - private Integer playNum; @ApiModelProperty(value = "每个档口可以购买当前广告位数量限制") private Integer storeBuyLimit; @ApiModelProperty(value = "是否可购买 true:可购买 false:不可购买") 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 23db75fa6..dae0264f0 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 @@ -23,8 +23,6 @@ public class AdRoundTypeRoundResDTO { private Long advertId; @ApiModelProperty(value = "广告轮次ID") private Integer roundId; - @ApiModelProperty(value = "播放数量") - private Integer playNum; @ApiModelProperty(value = "每个档口可以购买当前广告位数量限制") private Integer storeBuyLimit; @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 9a626ddfa..6970c9dde 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 @@ -245,7 +245,7 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService { .setSymbol(advertRound.getSymbol()).setLaunchStatus(advertRound.getLaunchStatus()).setStartTime(advertRound.getStartTime()) .setEndTime(advertRound.getEndTime()).setStartWeekDay(getDayOfWeek(advertRound.getStartTime())).setDurationDay(durationDay) // 设置是否可以购买当前推广位 - .setCanPurchased(this.setRoundCanPurchased(advertRound, storeId, currentRoundList)).setPlayNum(advert.getPlayNum()) + .setCanPurchased(this.setRoundCanPurchased(advertRound, storeId, currentRoundList)) .setEndWeekDay(getDayOfWeek(advertRound.getEndTime())).setStoreBuyLimit(advert.getStoreBuyLimit()) .setShowType(advertRound.getShowType()).setPosition(advertRound.getPosition()) .setUploadDeadline(redisCache.getCacheObject(ADVERT_UPLOAD_FILTER_TIME_KEY + advertRound.getSymbol()));