diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java index f40b98fa..7a7fdf14 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java @@ -195,6 +195,7 @@ public class YxStoreCartServiceImpl extends BaseServiceImpl() .lambda().eq(YxStoreCart::getId,storeCart.getId())); }else if(storeProduct.getIsShow() == 0 || storeProduct.getIsDel() == 1 || storeProduct.getStock() == 0){ + storeCartQueryVo.setProductInfo(storeProduct); invalid.add(storeCartQueryVo); }else{ if(StrUtil.isNotEmpty(storeCart.getProductAttrUnique())){ diff --git a/yshop-system/src/main/resources/config/application-prod.yml b/yshop-system/src/main/resources/config/application-prod.yml index cebb8137..e2968b40 100644 --- a/yshop-system/src/main/resources/config/application-prod.yml +++ b/yshop-system/src/main/resources/config/application-prod.yml @@ -47,7 +47,7 @@ spring: database: 0 host: 127.0.0.1 port: 6379 - password: + password: #连接超时时间 timeout: 5000