BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：推广营销返回数据调整；

pull/1121/head
liujiang 2025-11-13 21:21:21 +08:00
parent 90ce29b685
commit 83d4d9c7bf
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
View File

@ -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<String, String> json = new HashMap<>();
json.put("title", "aaa");
json.put("title", "generalRules");
json.put("content", str);
System.out.println(JSONUtil.toJsonStr(json));
}

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundTypeRoundResVO.java
View File

@ -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:不可购买")

2
xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundTypeRoundResDTO.java
View File

@ -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 = "是否可购买")

2
xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java
View File

@ -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()));