From 517249e0e1346fe6feb2c7ec545084f4ca51dccc Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Tue, 24 Dec 2019 12:12:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E7=9A=84=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-api/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 3d6f12d4..f40b98fa 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
@@ -201,6 +201,7 @@ public class YxStoreCartServiceImpl extends BaseServiceImpl<YxStoreCartMapper, Y
                     YxStoreProductAttrValue productAttrValue = productAttrService
                             .uniqueByAttrInfo(storeCart.getProductAttrUnique());
                     if(ObjectUtil.isNull(productAttrValue) || productAttrValue.getStock() == 0){
+                        storeCartQueryVo.setProductInfo(storeProduct);
                         invalid.add(storeCartQueryVo);
                     }else{
                         storeProduct.setAttrInfo(productAttrValue);
diff --git a/yshop-api/src/main/resources/config/application-prod.yml b/yshop-api/src/main/resources/config/application-prod.yml
index 1986b35c..b0e24ca0 100644
--- a/yshop-api/src/main/resources/config/application-prod.yml
+++ b/yshop-api/src/main/resources/config/application-prod.yml
@@ -6,7 +6,7 @@ spring:
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
       url: jdbc:log4jdbc:mysql://localhost:3306/yshop?serverTimezone=Asia/Shanghai&useSSL=false
       username: yshop
-      password:
+      password: 
 
       # 初始化配置
       initial-size: 3