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 8796365bf..357ae53ff 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 @@ -438,11 +438,11 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService { }) .collect(Collectors.toList()); // showType 为 时间范围的 每一轮最高的出价map - Map timeRangeRoundMaxPriceMap = allRoundList.stream() + Map timeRangeRoundMaxPriceMap = allRoundList.stream() .filter(x -> Objects.equals(x.getShowType(), AdShowType.TIME_RANGE.getValue())) .filter(x -> ObjectUtils.isNotEmpty(x.getPayPrice())) - .collect(Collectors.groupingBy(AdvertRound::getRoundId, Collectors - .mapping(AdvertRound::getPayPrice, Collectors.reducing(BigDecimal.ZERO, BigDecimal::max)))); + .collect(Collectors.groupingBy(x -> x.getTypeId().toString() + ":" + x.getRoundId().toString(), + Collectors.reducing(BigDecimal.ZERO, AdvertRound::getPayPrice, BigDecimal::max))); // showType 为 位置枚举的 每一个位置最高出价的 map Map positionEnumMaxPriceMap = allRoundList.stream() .filter(x -> Objects.equals(x.getShowType(), AdShowType.POSITION_ENUM.getValue())) @@ -473,7 +473,7 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService { // 设置是否能购买推广位 .setCanPurchased(DateUtils.getTime().compareTo(this.getDeadline(record.getSymbol())) > 0 ? Boolean.FALSE : Boolean.TRUE) .setBiddingStatusName(AdBiddingStatus.of(record.getBiddingStatus()).getLabel() - + ",最新出价:" + timeRangeRoundMaxPriceMap.get(record.getRoundId()))); + + ",最新出价:" + timeRangeRoundMaxPriceMap.get(record.getTypeId().toString() + ":" + record.getRoundId().toString()))); }); } if (MapUtils.isNotEmpty(boughtFailPositionMap)) {