diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdSkuResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdSkuResVO.java index c92a40cb3..2dda73cd3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdSkuResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdSkuResVO.java @@ -24,6 +24,8 @@ public class StoreProdSkuResVO { private String prodName; @ApiModelProperty(value = "商品货号") private String prodArtNum; + @ApiModelProperty(value = "主图") + private String mainPicUrl; @ApiModelProperty(value = "颜色列表") private List colorList; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdSkuResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdSkuResDTO.java index 0d09f8c79..c00fb3057 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdSkuResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdSkuResDTO.java @@ -25,6 +25,8 @@ public class StoreProdSkuResDTO { private String prodName; @ApiModelProperty(value = "商品货号") private String prodArtNum; + @ApiModelProperty(value = "主图") + private String mainPicUrl; @ApiModelProperty(value = "颜色列表") private List colorList; 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 e48c0a326..45f151747 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 @@ -46,6 +46,7 @@ import com.ruoyi.xkt.dto.storeProdSvc.StoreProdSvcDTO; import com.ruoyi.xkt.dto.storeProduct.*; import com.ruoyi.xkt.dto.storeProductFile.StoreProdFileDTO; import com.ruoyi.xkt.dto.storeProductFile.StoreProdFileResDTO; +import com.ruoyi.xkt.dto.storeProductFile.StoreProdMainPicDTO; import com.ruoyi.xkt.dto.userBrowsingHistory.UserBrowsingHisDTO; import com.ruoyi.xkt.dto.userNotice.UserFocusAndFavUserIdDTO; import com.ruoyi.xkt.enums.*; @@ -760,10 +761,17 @@ public class StoreProductServiceImpl implements IStoreProductService { StoreProduct storeProd = Optional.ofNullable(this.storeProdMapper.selectOne(new LambdaQueryWrapper() .eq(StoreProduct::getId, storeProdId).eq(StoreProduct::getDelFlag, Constants.UNDELETED))) .orElseThrow(() -> new ServiceException("档口商品不存在!", HttpStatus.ERROR)); + StoreProdSkuResDTO skuDTO = BeanUtil.toBean(storeProd, StoreProdSkuResDTO.class); + // 获取商品主图 + List prodFileList = this.storeProdFileMapper + .selectMainPicByStoreProdIdList(Collections.singletonList(storeProdId), FileType.MAIN_PIC.getValue(), ORDER_NUM_1); + if (CollectionUtils.isNotEmpty(prodFileList)) { + skuDTO.setMainPicUrl(prodFileList.get(0).getFileUrl()); + } // 档口商品的sku列表 List prodSkuList = this.storeProdMapper.selectSkuList(storeProdId); if (CollectionUtils.isEmpty(prodSkuList)) { - return BeanUtil.toBean(storeProd, StoreProdSkuResDTO.class); + return skuDTO; } // 获取当前档口商品的sku列表 Map colorSizeStockMap = this.getProdStockList(storeProdId); @@ -779,7 +787,7 @@ public class StoreProductServiceImpl implements IStoreProductService { .setStock(colorSizeStockMap.get(color.getStoreColorId() + ":" + size.getSize()))) .collect(Collectors.toList())); }); - return BeanUtil.toBean(storeProd, StoreProdSkuResDTO.class).setStoreProdId(storeProdId).setColorList(colorList); + return skuDTO.setStoreProdId(storeProdId).setColorList(colorList); } @Transactional(rollbackFor = Exception.class)