diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java index 2c3d5c8cb..b22a79189 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsiteAPPServiceImpl.java @@ -391,15 +391,12 @@ public class WebsiteAPPServiceImpl implements IWebsiteAPPService { if (CollectionUtils.isEmpty(oneMonthList)) { return new ArrayList<>(); } - /*final List storeProdIdList = oneMonthList.stream() + final List storeProdIdList = oneMonthList.stream() .filter(x -> StringUtils.isNotBlank(x.getProdIdStr())).map(x -> Long.parseLong(x.getProdIdStr())).distinct().collect(Collectors.toList()); // 档口商品的价格及商品主图map Map prodPriceAndMainPicMap = CollectionUtils.isEmpty(storeProdIdList) ? new ConcurrentHashMap<>() : this.storeProdMapper.selectPriceAndMainPicList(storeProdIdList).stream().collect(Collectors - .toMap(StoreProdPriceAndMainPicDTO::getStoreProdId, Function.identity()));*/ - - - + .toMap(StoreProdPriceAndMainPicDTO::getStoreProdId, Function.identity())); List launchingList = oneMonthList.stream().filter(x -> Objects.equals(x.getLaunchStatus(), AdLaunchStatus.LAUNCHING.getValue())) .filter(x -> Objects.equals(x.getBiddingStatus(), AdBiddingStatus.BIDDING_SUCCESS.getValue())).collect(Collectors.toList()); List expiredList = oneMonthList.stream().filter(x -> Objects.equals(x.getLaunchStatus(), AdLaunchStatus.EXPIRED.getValue())).collect(Collectors.toList());