diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartResVO.java index 186f6bca7..66e818cfc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartResVO.java @@ -27,6 +27,8 @@ public class ShopCartResVO { private Long storeProdId; @ApiModelProperty(value = "商品货号") private String prodArtNum; + @ApiModelProperty(value = "商品标题") + private String prodTitle; @ApiModelProperty(value = "商品主图") private String mainPicUrl; @ApiModelProperty(value = "进货车明细列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShoppingCartDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShoppingCartDTO.java index 9ec1c81b8..abc32935a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShoppingCartDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/userShoppingCart/ShoppingCartDTO.java @@ -26,6 +26,8 @@ public class ShoppingCartDTO { private Long storeProdId; @ApiModelProperty(value = "商品货号") private String prodArtNum; + @ApiModelProperty(value = "商品标题") + private String prodTitle; @ApiModelProperty(value = "商品主图") private String mainPicUrl; @ApiModelProperty(value = "进货车明细列表") diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java index c6706788e..c279ee2b5 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java @@ -51,6 +51,7 @@ public class ShoppingCartServiceImpl implements IShoppingCartService { final StoreProductFileMapper prodFileMapper; final StoreProductCategoryAttributeMapper prodCateAttrMapper; final StoreMapper storeMapper; + final StoreProductMapper storeProdMapper; /** @@ -299,11 +300,16 @@ public class ShoppingCartServiceImpl implements IShoppingCartService { .in(StoreProductColorSize::getStoreProdId, shoppingCartList.stream().map(ShoppingCart::getStoreProdId).collect(Collectors.toList())) .in(StoreProductColorSize::getStoreColorId, detailList.stream().map(ShoppingCartDetail::getStoreColorId).collect(Collectors.toList())) .eq(StoreProductColorSize::getDelFlag, Constants.UNDELETED)); + List storeProdList = this.storeProdMapper.selectList(new LambdaQueryWrapper() + .in(StoreProduct::getId, shoppingCartList.stream().map(ShoppingCart::getStoreProdId).collect(Collectors.toList())) + .eq(StoreProduct::getDelFlag, Constants.UNDELETED)); + Map storeProdMap = storeProdList.stream().collect(Collectors.toMap(StoreProduct::getId, Function.identity())); // 商品价格尺码map Map priceSizeMap = priceSizeList.stream().collect(Collectors .toMap(x -> x.getStoreProdId().toString() + x.getStoreColorId().toString() + x.getSize(), StoreProductColorSize::getId)); return shoppingCartList.stream().map(x -> { ShoppingCartDTO shopCartDTO = BeanUtil.toBean(x, ShoppingCartDTO.class).setMainPicUrl(mainPicMap.get(x.getStoreProdId())) + .setProdTitle(ObjectUtils.isNotEmpty(storeProdMap.get(x.getStoreProdId())) ? storeProdMap.get(x.getStoreProdId()).getProdTitle() : "") .setStoreName(ObjectUtils.isNotEmpty(storeMap.get(x.getStoreId())) ? storeMap.get(x.getStoreId()).getStoreName() : ""); List shopCartDetailList = detailMap.get(x.getId()).stream().map(detail -> { final BigDecimal price = ObjectUtils.defaultIfNull(priceMap.get(x.getStoreProdId().toString() + detail.getStoreColorId().toString()), BigDecimal.ZERO);