From 9f704f30cdc5a59491cbb2e74fe3e0b09148bab8 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Tue, 21 Oct 2025 23:48:32 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9APC=E4=B8=8B=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=BF=94=E5=9B=9E=E5=8F=91=E8=B4=A7=E6=97=B6=E6=95=88?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/xkt/vo/userShoppingCart/ShopCartResVO.java | 2 ++ .../com/ruoyi/xkt/dto/userShoppingCart/ShoppingCartDTO.java | 2 ++ .../com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java | 6 ++++-- 3 files changed, 8 insertions(+), 2 deletions(-) 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 1300ec894..3fa2753ef 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 @@ -28,6 +28,8 @@ public class ShopCartResVO { private String prodArtNum; @ApiModelProperty(value = "商品标题") private String prodTitle; + @ApiModelProperty(value = "发货时效") + private Integer deliveryTime; @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 18f297f1d..a4512edf6 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 @@ -27,6 +27,8 @@ public class ShoppingCartDTO { private String prodArtNum; @ApiModelProperty(value = "商品标题") private String prodTitle; + @ApiModelProperty(value = "发货时效") + private Integer deliveryTime; @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 99e0c6e9f..37f4292c7 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 @@ -285,8 +285,10 @@ public class ShoppingCartServiceImpl implements IShoppingCartService { .toMap(x -> x.getStoreProdId().toString() + x.getStoreColorId().toString() + x.getSize(), x -> x)); 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() : ""); + .setProdTitle(storeProdMap.containsKey(x.getStoreProdId()) ? storeProdMap.get(x.getStoreProdId()).getProdTitle() : "") + // 默认发货时效为3天 + .setDeliveryTime(storeProdMap.containsKey(x.getStoreProdId()) ? storeProdMap.get(x.getStoreProdId()).getDeliveryTime() : 3) + .setStoreName(storeMap.containsKey(x.getStoreId()) ? storeMap.get(x.getStoreId()).getStoreName() : ""); List shopCartDetailList = detailMap.get(x.getId()).stream().map(detail -> { final StoreProductColorSize prodColorSize = priceSizeMap.get(x.getStoreProdId().toString() + detail.getStoreColorId().toString() + detail.getSize()); return ObjectUtils.isEmpty(prodColorSize) ? null : BeanUtil.toBean(detail, ShoppingCartDTO.SCDetailDTO.class)