From 7bcaff71d635894f9a0d918647b63ca7a44db11b Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Wed, 8 Oct 2025 21:46:44 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=90=9C=E7=B4=A2=E6=A1=86?= =?UTF-8?q?=E5=86=85=E5=B9=BF=E5=91=8A=E5=95=86=E5=93=81=20=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E5=8A=A0=E4=B8=8A=E6=A1=A3=E5=8F=A3=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../advertRound/pc/index/PCIndexSearchRecommendProdVO.java | 2 ++ .../advertRound/pc/index/PCIndexSearchRecommendProdDTO.java | 2 ++ .../com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexSearchRecommendProdVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexSearchRecommendProdVO.java index d17c4472d..6e175d657 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexSearchRecommendProdVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexSearchRecommendProdVO.java @@ -19,6 +19,8 @@ public class PCIndexSearchRecommendProdVO { private Long storeProdId; @ApiModelProperty(value = "档口ID") private Long storeId; + @ApiModelProperty(value = "档口名称") + private String storeName; @ApiModelProperty(value = "商品货号") private String prodArtNum; @ApiModelProperty(value = "排序") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/pc/index/PCIndexSearchRecommendProdDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/pc/index/PCIndexSearchRecommendProdDTO.java index fa2825806..0e77441b2 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/pc/index/PCIndexSearchRecommendProdDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/pc/index/PCIndexSearchRecommendProdDTO.java @@ -19,6 +19,8 @@ public class PCIndexSearchRecommendProdDTO { private Long storeProdId; @ApiModelProperty(value = "档口ID") private Long storeId; + @ApiModelProperty(value = "档口名称") + private String storeName; @ApiModelProperty(value = "商品货号") private String prodArtNum; @ApiModelProperty(value = "排序") diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java index 7dfb83709..0359ade6e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java @@ -965,6 +965,10 @@ public class WebsitePCServiceImpl implements IWebsitePCService { if (CollectionUtils.isEmpty(oneMonthList)) { return new ArrayList<>(); } + List storeList = this.storeMapper.selectList(new LambdaQueryWrapper().eq(Store::getDelFlag, Constants.UNDELETED) + .in(Store::getId, oneMonthList.stream().map(AdvertRound::getStoreId).collect(Collectors.toList()))); + Map storeMap = CollectionUtils.isEmpty(storeList) ? new HashMap<>() + : storeList.stream().collect(Collectors.toMap(Store::getId, Function.identity())); final List storeProdIdList = oneMonthList.stream() .filter(x -> StringUtils.isNotBlank(x.getProdIdStr())).map(x -> Long.parseLong(x.getProdIdStr())).distinct().collect(Collectors.toList()); // 档口商品的价格及商品主图map @@ -984,6 +988,7 @@ public class WebsitePCServiceImpl implements IWebsitePCService { AdvertRound advertRound = list.get(0); final Long storeProdId = Long.parseLong(advertRound.getProdIdStr()); tempList.add(new PCIndexSearchRecommendProdDTO().setDisplayType(AdDisplayType.PRODUCT.getValue()).setStoreProdId(storeProdId).setStoreId(advertRound.getStoreId()) + .setStoreName(storeMap.containsKey(advertRound.getStoreId()) ? storeMap.get(advertRound.getStoreId()).getStoreName() : "") .setProdArtNum(ObjectUtils.isNotEmpty(prodPriceAndMainPicMap.get(storeProdId)) ? prodPriceAndMainPicMap.get(storeProdId).getProdArtNum() : "") .setMainPicUrl(ObjectUtils.isNotEmpty(prodPriceAndMainPicMap.get(storeProdId)) ? prodPriceAndMainPicMap.get(storeProdId).getMainPicUrl() : "")); }); @@ -996,6 +1001,7 @@ public class WebsitePCServiceImpl implements IWebsitePCService { final Long storeProdId = Long.parseLong(advertRound.getProdIdStr()); return new PCIndexSearchRecommendProdDTO().setDisplayType(AdDisplayType.PRODUCT.getValue()).setStoreProdId(storeProdId) .setOrderNum(this.positionToNumber(advertRound.getPosition())).setStoreId(advertRound.getStoreId()) + .setStoreName(storeMap.containsKey(advertRound.getStoreId()) ? storeMap.get(advertRound.getStoreId()).getStoreName() : "") .setProdArtNum(ObjectUtils.isNotEmpty(prodPriceAndMainPicMap.get(storeProdId)) ? prodPriceAndMainPicMap.get(storeProdId).getProdArtNum() : "") .setMainPicUrl(ObjectUtils.isNotEmpty(prodPriceAndMainPicMap.get(storeProdId)) ? prodPriceAndMainPicMap.get(storeProdId).getMainPicUrl() : ""); }).collect(Collectors.toList());