goods

e01d3454 · zhz · f4bcd92f · e01d3454
Commit e01d3454 authored Dec 06, 2018 by zhz
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

GoodsUtil.php application/library/Goods/GoodsUtil.php +2 -2

No files found.
--- a/application/library/Goods/GoodsUtil.php
+++ b/application/library/Goods/GoodsUtil.php
@@ -29,10 +29,10 @@ 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 $goods['goods_price'];
+            return $price ? $price : $goods['goods_price'];
        }else{
            $pBundlingService = \Business\Goods\GroupSaleServiceModel::getInstance();
            $pBundling = $pBundlingService->getOnePBundingCache($goodsId,$dbName);