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：系统BUG优化；

pull/1121/head
liujiang 2025-09-11 11:30:38 +08:00
parent 4251ddee05
commit a75e802cba
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java
View File

@ -22,6 +22,7 @@ import com.ruoyi.xkt.service.IAssetService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -62,7 +63,7 @@ public class AdminAdvertRoundServiceImpl implements IAdminAdvertRoundService {
@Transactional(readOnly = true)
public Page<AdminAdRoundPageResDTO> page(AdminAdRoundPageDTO pageDTO) {
// 用户是否为档口管理者或子账户
if (!SecurityUtils.isAdmin() ) {
if (!SecurityUtils.isAdmin()) {
throw new ServiceException("当前用户非管理员账号，无权限操作!", HttpStatus.ERROR);
}
Optional.ofNullable(pageDTO.getLaunchStatus()).orElseThrow(() -> new ServiceException("投放状态launchStatus必传", HttpStatus.ERROR));
@ -100,7 +101,7 @@ public class AdminAdvertRoundServiceImpl implements IAdminAdvertRoundService {
@Transactional
public Integer auditPic(AdminAdRoundAuditDTO auditDTO) {
// 用户是否为档口管理者或子账户
if (!SecurityUtils.isAdmin() ) {
if (!SecurityUtils.isAdmin()) {
throw new ServiceException("当前用户非管理员账号，无权限操作!", HttpStatus.ERROR);
}
AdvertRound advertRound = Optional.ofNullable(this.advertRoundMapper.selectOne(new LambdaQueryWrapper<AdvertRound>()
@ -134,7 +135,7 @@ public class AdminAdvertRoundServiceImpl implements IAdminAdvertRoundService {
@Transactional
public Integer unsubscribe(AdminAdRoundUnsubscribeDTO unsubscribeDTO) {
// 用户是否为档口管理者或子账户
if (!SecurityUtils.isAdmin() ) {
if (!SecurityUtils.isAdmin()) {
throw new ServiceException("当前用户非管理员账号，无权限操作!", HttpStatus.ERROR);
}
AdvertRound advertRound = Optional.ofNullable(this.advertRoundMapper.selectOne(new LambdaQueryWrapper<AdvertRound>()
@ -166,7 +167,7 @@ public class AdminAdvertRoundServiceImpl implements IAdminAdvertRoundService {
@Transactional
public Integer uploadAdvertPic(AdRoundUpdateDTO picDTO) {
// 用户是否为档口管理者或子账户
if (!SecurityUtils.isAdmin() ) {
if (!SecurityUtils.isAdmin()) {
throw new ServiceException("当前用户非管理员账号，无权限操作!", HttpStatus.ERROR);
}
AdvertRound advertRound = Optional.ofNullable(this.advertRoundMapper.selectOne(new LambdaQueryWrapper<AdvertRound>()
@ -198,7 +199,7 @@ public class AdminAdvertRoundServiceImpl implements IAdminAdvertRoundService {
@Transactional
public synchronized Integer sysIntercept(AdminAdRoundSysInterceptDTO interceptDTO) {
// 用户是否为档口管理者或子账户
if (!SecurityUtils.isAdmin() ) {
if (!SecurityUtils.isAdmin()) {
throw new ServiceException("当前用户非管理员账号，无权限操作!", HttpStatus.ERROR);
}
final LocalDateTime nineThirty = LocalDateTime.of(LocalDate.now(), LocalTime.of(21, 30));
@ -269,6 +270,10 @@ public class AdminAdvertRoundServiceImpl implements IAdminAdvertRoundService {
if (ObjectUtils.isNotEmpty(interceptDTO.getStoreProdIdList())) {
advertRound.setProdIdStr(StringUtils.join(interceptDTO.getStoreProdIdList(), ","));
}
// 如果是位置枚举，则设置一个很高的价格（200 - 300）范围，有其它档口愿意出更高价格拿下就随他去
if (Objects.equals(advertRound.getShowType(), AdShowType.POSITION_ENUM.getValue())) {
advertRound.setPayPrice(BigDecimal.valueOf(RandomUtils.nextLong(20, 30 + 1) * 10));
}
return this.advertRoundMapper.updateById(advertRound);
}
@ -282,7 +287,7 @@ public class AdminAdvertRoundServiceImpl implements IAdminAdvertRoundService {
@Transactional
public Integer cancelIntercept(AdminAdRoundCancelInterceptDTO cancelInterceptDTO) {
// 用户是否为档口管理者或子账户
if (!SecurityUtils.isAdmin() ) {
if (!SecurityUtils.isAdmin()) {
throw new ServiceException("当前用户非管理员账号，无权限操作!", HttpStatus.ERROR);
}
// 该推广位是否被拦截

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

@ -70,6 +70,13 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService {
// 推广营销位锁 key：symbol + roundId 或者 symbol + roundId + position 。value都是new Object()
public static Map<String, Object> advertLockMap = new ConcurrentHashMap<>();
// 推广轮次待播放 及 正在播放
private static final List<Integer> LAUNCHING_STATUS_LIST =
Arrays.asList(AdLaunchStatus.LAUNCHING.getValue(), AdLaunchStatus.UN_LAUNCH.getValue());
// 推广轮次 未出价 及 已出价
private static final List<Integer> BIDDING_STATUS_LIST =
Arrays.asList(AdBiddingStatus.BIDDING.getValue(), AdBiddingStatus.UN_BIDDING.getValue());
/**
* 项目启动后执行一次，做初始化操作
@ -695,7 +702,7 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService {
}
LambdaQueryWrapper<AdvertRound> queryWrapper = new LambdaQueryWrapper<AdvertRound>()
.eq(AdvertRound::getAdvertId, createDTO.getAdvertId()).eq(AdvertRound::getRoundId, createDTO.getRoundId())
.in(AdvertRound::getBiddingStatus, Arrays.asList(AdBiddingStatus.BIDDING.getValue(), AdBiddingStatus.UN_BIDDING.getValue()))
.in(AdvertRound::getLaunchStatus, LAUNCHING_STATUS_LIST).in(AdvertRound::getBiddingStatus, BIDDING_STATUS_LIST)
.eq(AdvertRound::getDelFlag, Constants.UNDELETED).orderByAsc(AdvertRound::getPayPrice).last("LIMIT 1");
// 如果是 时间范围 的广告位，则不查 系统拦截的数据；其实位置枚举的广告位也可不用查系统拦截的数据，主要是为了真实，给档口留个缝
if (Objects.equals(createDTO.getShowType(), AdShowType.TIME_RANGE.getValue())) {