From 2ff86514e31be11863e763b062b5a99bf5fcb36e Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Mon, 3 Nov 2025 23:50:02 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=97=B6=E9=97=B4=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E5=B9=BF=E5=91=8A=E4=BD=8D=EF=BC=8C=E6=A1=A3=E5=8F=A3?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=B7=B2=E5=87=BA?= =?UTF-8?q?=E4=BB=B7=E4=BD=86=E5=8F=88=E6=98=BE=E7=A4=BA=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E2=80=9C=E7=AB=8B=E5=8D=B3=E8=AE=A2=E8=B4=AD?= =?UTF-8?q?=E2=80=9DBUG=E4=BF=AE=E5=A4=8D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 199c53697..59f964032 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 @@ -230,7 +230,9 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService { final Date date = new Date(); advertRoundList.stream().collect(Collectors.groupingBy(AdvertRound::getRoundId)) .forEach((roundId, currentRoundList) -> { - AdvertRound advertRound = currentRoundList.get(0); + // 如果有当前当前档口购买的推广轮次,则取该条记录,因为setCanPurchased会用到。反之则取第一个 + AdvertRound advertRound = currentRoundList.stream().filter(x -> Objects.equals(x.getStoreId(), storeId)) + .findFirst().orElse(currentRoundList.get(0)); Integer durationDay = calculateDurationDay(advertRound.getStartTime(), advertRound.getEndTime(), Boolean.TRUE); AdRoundTypeRoundResDTO typeRoundResDTO = new AdRoundTypeRoundResDTO().setAdvertId(advertRound.getAdvertId()).setRoundId(advertRound.getRoundId()) .setSymbol(advertRound.getSymbol()).setLaunchStatus(advertRound.getLaunchStatus()).setStartTime(advertRound.getStartTime())