From 2b65bd2944d10ff479416f80d33d238f4ad63df9 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Fri, 15 Aug 2025 16:36:28 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=95=86=E5=9F=8E=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/advertRound/pc/index/PCIndexTopRightBannerVO.java | 2 ++ .../web/controller/xkt/vo/storeProd/StoreProdPCResVO.java | 5 +++-- .../dto/advertRound/pc/index/PCIndexTopRightBannerDTO.java | 2 ++ .../com/ruoyi/xkt/dto/storeProduct/StoreProdPCResDTO.java | 5 +++-- .../ruoyi/xkt/service/impl/StoreProductServiceImpl.java | 7 ++++++- .../com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java | 5 +++-- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexTopRightBannerVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexTopRightBannerVO.java index eafd47a5f..85bc90b58 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexTopRightBannerVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexTopRightBannerVO.java @@ -21,5 +21,7 @@ public class PCIndexTopRightBannerVO { private Integer orderNum; @ApiModelProperty(value = "商品第一张主图路径") private String fileUrl; + @ApiModelProperty(value = "档口ID") + private Long storeId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPCResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPCResVO.java index 906c2a2ac..ff85c1436 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPCResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPCResVO.java @@ -8,6 +8,7 @@ import lombok.Data; import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.Map; /** * @author liujiang @@ -33,8 +34,8 @@ public class StoreProdPCResVO { private Integer overPrice; @ApiModelProperty(value = "颜色列表") private List colorList; - @ApiModelProperty(value = "档口类目属性") - private StoreProdCateAttrVO cateAttr; + @ApiModelProperty(value = "档口类目属性map") + private Map cateAttrMap; @ApiModelProperty(value = "详情内容") private String detail; @ApiModelProperty(value = "商品主图视频及主图") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/pc/index/PCIndexTopRightBannerDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/pc/index/PCIndexTopRightBannerDTO.java index 9e52b31cf..90eb62600 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/pc/index/PCIndexTopRightBannerDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/pc/index/PCIndexTopRightBannerDTO.java @@ -21,5 +21,7 @@ public class PCIndexTopRightBannerDTO { private Integer orderNum; @ApiModelProperty(value = "商品第一张主图路径") private String fileUrl; + @ApiModelProperty(value = "档口ID") + private Long storeId; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPCResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPCResDTO.java index 03f044737..e33d3ef5c 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPCResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPCResDTO.java @@ -8,6 +8,7 @@ import lombok.experimental.Accessors; import java.util.Date; import java.util.List; +import java.util.Map; /** * @author liujiang @@ -37,8 +38,8 @@ public class StoreProdPCResDTO { private Integer overPrice; @ApiModelProperty(value = "颜色列表") private List colorList; - @ApiModelProperty(value = "档口类目属性") - private StoreProdCateAttrDTO cateAttr; + @ApiModelProperty(value = "档口类目属性map") + private Map cateAttrMap; @ApiModelProperty(value = "详情内容") private String detail; @ApiModelProperty(value = "商品主图视频及主图") diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java index 63db96195..ca57665dc 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java @@ -840,7 +840,9 @@ public class StoreProductServiceImpl implements IStoreProductService { StoreProductCategoryAttribute cateAttr = this.storeProdCateAttrMapper.selectOne(new LambdaQueryWrapper() .eq(StoreProductCategoryAttribute::getStoreProdId, storeProdId).eq(StoreProductCategoryAttribute::getDelFlag, Constants.UNDELETED)); List fileList = this.storeProdFileMapper.selectVideoAndMainPicList(storeProdId); - prodInfoDTO.setCateAttr(BeanUtil.toBean(cateAttr, StoreProdPCResDTO.StoreProdCateAttrDTO.class)) + prodInfoDTO + // 获取商品的属性 + .setCateAttrMap(this.getCateAttrMap(cateAttr)) // 获取商品的主图视频及主图 .setFileList(fileList); // 档口商品的sku列表 @@ -1315,6 +1317,9 @@ public class StoreProductServiceImpl implements IStoreProductService { * @return Map */ private Map getCateAttrMap(StoreProductCategoryAttribute cateAttr) { + if (ObjectUtils.isEmpty(cateAttr)) { + return new HashMap<>(); + } // 使用 LinkedHashMap 保持属性顺序 Map cateAttrMap = new LinkedHashMap<>(); // 1. 帮面材质 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 f57e92ab6..a99469a4c 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 @@ -439,7 +439,8 @@ public class WebsitePCServiceImpl implements IWebsitePCService { } else { topRightList = launchingList.stream().filter(x -> StringUtils.isNotBlank(x.getProdIdStr())) .map(x -> new PCIndexTopRightBannerDTO().setDisplayType(x.getDisplayType()).setStoreProdId(Long.valueOf(x.getProdIdStr())) - .setFileUrl(mainPicMap.get(Long.valueOf(x.getProdIdStr()))).setOrderNum(this.positionToNumber(x.getPosition()))) + .setFileUrl(mainPicMap.get(Long.valueOf(x.getProdIdStr()))) + .setOrderNum(this.positionToNumber(x.getPosition())).setStoreId(x.getStoreId())) .collect(Collectors.toList()); // 如果 launchingList 只有一个则还需要补充一个推广填空 if (launchingList.size() < 2) { @@ -1538,7 +1539,7 @@ public class WebsitePCServiceImpl implements IWebsitePCService { .forEach((storeId, list) -> { AdvertRound advertRound = list.get(0); tempRightList.add(new PCIndexTopRightBannerDTO().setDisplayType(advertRound.getDisplayType()).setStoreProdId(Long.valueOf(advertRound.getProdIdStr())) - .setFileUrl(mainPicMap.get(Long.valueOf(advertRound.getProdIdStr())))); + .setFileUrl(mainPicMap.get(Long.valueOf(advertRound.getProdIdStr()))).setStoreId(advertRound.getStoreId())); }); return tempRightList.stream().limit(limitCount).collect(Collectors.toList()); }