Skip to content

M
my-yaf-project
Commit 6c38eeca authored by zhz's avatar zhz
Browse files
Options

sale

parent 9d39dd70
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
application/models/Business/Goods/GoodsCommonService.php
View file @ 6c38eeca
...@@ -1275,10 +1275,10 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -1275,10 +1275,10 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
} }
if($activities){ if($activities){
if($data = \DAO\SaleGoodsModel::getInstance()->getSaleGoods($storeId,$goodsCommon['goods_commonid'],true)){ if($data = \DAO\SaleGoodsModel::getInstance()->getSaleGoods($storeId,$goodsCommon['goods_commonid'],true)){
return \DAO\SaleGoodsModel::getInstance()->getSalePrice($data,$activities); $price = \DAO\SaleGoodsModel::getInstance()->getSalePrice($data,$activities);
} }
} }
return $goodsCommon['goods_price']; return $price ? $price : $goodsCommon['goods_price'];
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment