Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/library/Goods/GoodsUtil.php

@@ -29,7 +29,8 @@ class GoodsUtil {
             }
             if($activities){
                 if($data = \DAO\SaleGoodsModel::getInstance()->getSaleGoods($storeId,$goodsId)){
-                    return \DAO\SaleGoodsModel::getInstance()->getSalePrice($data,$activities,$array);
+                    $price = \DAO\SaleGoodsModel::getInstance()->getSalePrice($data,$activities,$array);
+                    return $price ? $price : $goods['goods_price'];
                 }
             }
             return $goods['goods_price'];

application/models/DAO/SaleGoods.php

@@ -110,7 +110,7 @@ class SaleGoodsModel extends \DAO\AbstractModel {
         if($data && in_array($data['sale_act_id'],$activitiesKeys)){
             $price = $data['discount_price'];
         }
-        if($array) {
+        if($array && $price) {
             return array('sale_act_id'=>$data['sale_act_id'],'sale_id'=>$activities[$data['sale_act_id']],'price'=>$price);
         }
         return $price;