From 533209cf7442e2145e8b6fea5278f8d4c74b6c39 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sun, 2 Feb 2020 21:59:36 +0800 Subject: [PATCH] =?UTF-8?q?yshop1.9.3,=E4=BF=AE=E5=A4=8D=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E8=BD=A6=E7=AD=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shop/service/impl/YxStoreCartServiceImpl.java | 1 + yshop-system/src/main/resources/config/application-prod.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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