Skip to content

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

goods

parent f75448ae
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 10 deletions
application/models/Business/Goods/GoodsCommonService.php
View file @ d3d44322
...@@ -401,20 +401,25 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -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']); $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{ }else{
foreach ($goods as $v){ if($goods) {
$spec = []; foreach ($goods as $v){
if($activities){ $spec = [];
if($data = \DAO\SaleGoodsModel::getInstance()->getSaleGoods($commonInfo['store_id'],$goods[0]['goods_id'])){ if($activities){
if($price = \DAO\SaleGoodsModel::getInstance()->getSalePrice($data,$activities)){ if($data = \DAO\SaleGoodsModel::getInstance()->getSaleGoods($commonInfo['store_id'],$goods[0]['goods_id'])){
$commonInfo['goods_price'] = $price; if($price = \DAO\SaleGoodsModel::getInstance()->getSalePrice($data,$activities)){
$v['goods_price'] = $price; $commonInfo['goods_price'] = $price;
$v['goods_price'] = $price;
}
} }
} }
} $commonInfo['goodsId'] = $v['goods_id'];
$commonInfo['goodsId'] = $v['goods_id']; $sumStorage = $onlineStorageGoods ? unserialize($onlineStorageGoods[$v['goods_id']])['goodsStorage']:$v['goods_storage'];
$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); // $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); 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);
} }
......
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