goods

application/models/Business/Goods/GoodsCommonService.php

@@ -401,20 +401,25 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
                 $goodsArr[] = array('goodsAttr'=>$spec,'goodsId'=>$v['goods_id'],'goodsPrice'=>$v['goods_price'],'goodsMarketPrice'=>$v['goods_marketprice'],'goodsStorage'=>$onlineStorageGoods ? unserialize($onlineStorageGoods[$v['goods_id']])['goodsStorage']:$v['goods_storage']);
             }
         }else{
-            foreach ($goods as $v){
-                $spec = [];
-                if($activities){
-                    if($data = \DAO\SaleGoodsModel::getInstance()->getSaleGoods($commonInfo['store_id'],$goods[0]['goods_id'])){
-                        if($price = \DAO\SaleGoodsModel::getInstance()->getSalePrice($data,$activities)){
-                            $commonInfo['goods_price'] = $price;
-                            $v['goods_price'] = $price;
+            if($goods) {
+                foreach ($goods as $v){
+                    $spec = [];
+                    if($activities){
+                        if($data = \DAO\SaleGoodsModel::getInstance()->getSaleGoods($commonInfo['store_id'],$goods[0]['goods_id'])){
+                            if($price = \DAO\SaleGoodsModel::getInstance()->getSalePrice($data,$activities)){
+                                $commonInfo['goods_price'] = $price;
+                                $v['goods_price'] = $price;
+                            }
                         }
                     }
-                }
-                $commonInfo['goodsId'] = $v['goods_id'];
-                $sumStorage = $onlineStorageGoods ? unserialize($onlineStorageGoods[$v['goods_id']])['goodsStorage']:$v['goods_storage'];
+                    $commonInfo['goodsId'] = $v['goods_id'];
+                    $sumStorage = $onlineStorageGoods ? unserialize($onlineStorageGoods[$v['goods_id']])['goodsStorage']:$v['goods_storage'];
 //                $goodsArr[] = array('goodsAttr'=>$spec,'goodsId'=>$v['goods_id'],'goodsPrice'=>$v['goods_price'],'goodsMarketPrice'=>$v['goods_marketprice'],'goodsStorage'=>$sumStorage);
+                }
+            }else{
+                $commonInfo['goodsId'] = 0;
             }
+
         }
         return array('goodsMarketPrice'=>$commonInfo['goods_marketprice'],'goodsPrice'=>$commonInfo['goods_price'],'goodsStorage'=>$sumStorage,'previewImage'=>$commonInfo['goods_image'],'isNew'=>$commonInfo['goods_new'],'attr'=>$attr,'goods'=>$goodsArr,'images'=>$images,'commonInfo'=>$commonInfo);
     }