Commit 6511c286 authored by zhz's avatar zhz

sale

parent e01d3454
...@@ -30,9 +30,10 @@ class GoodsUtil { ...@@ -30,9 +30,10 @@ class GoodsUtil {
if($activities){ if($activities){
if($data = \DAO\SaleGoodsModel::getInstance()->getSaleGoods($storeId,$goodsId)){ if($data = \DAO\SaleGoodsModel::getInstance()->getSaleGoods($storeId,$goodsId)){
$price = \DAO\SaleGoodsModel::getInstance()->getSalePrice($data,$activities,$array); $price = \DAO\SaleGoodsModel::getInstance()->getSalePrice($data,$activities,$array);
return $price ? $price : $goods['goods_price'];
} }
} }
return $price ? $price : $goods['goods_price']; return $goods['goods_price'];
}else{ }else{
$pBundlingService = \Business\Goods\GroupSaleServiceModel::getInstance(); $pBundlingService = \Business\Goods\GroupSaleServiceModel::getInstance();
$pBundling = $pBundlingService->getOnePBundingCache($goodsId,$dbName); $pBundling = $pBundlingService->getOnePBundingCache($goodsId,$dbName);
......
...@@ -110,7 +110,7 @@ class SaleGoodsModel extends \DAO\AbstractModel { ...@@ -110,7 +110,7 @@ class SaleGoodsModel extends \DAO\AbstractModel {
if($data && in_array($data['sale_act_id'],$activitiesKeys)){ if($data && in_array($data['sale_act_id'],$activitiesKeys)){
$price = $data['discount_price']; $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 array('sale_act_id'=>$data['sale_act_id'],'sale_id'=>$activities[$data['sale_act_id']],'price'=>$price);
} }
return $price; return $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