Commit ba1f2f53 authored by zhz's avatar zhz

store

parent d5553a33
File mode changed from 100755 to 100644
......@@ -203,7 +203,7 @@ class StoreServiceModel extends \Business\AbstractModel{
if($stcGoods){
$goodsIds = array_column($stcGoods,'goods_common_id');
$goodsCommonDAO = \DAO\GoodsCommonModel::getInstance();
if($activities === false){
if(empty($activities)){
$tempGoods = $goodsCommonDAO->getGoodsList(array('goods_commonid in('.implode(',',$goodsIds).')'),'goods_name,goods_image,goods_price as goodsPrice,goods_marketprice,goods_commonid');
}else{
$tempGoods = $goodsCommonDAO->getListWithSale(array('han_goods_common.goods_commonid in('.implode(',',$goodsIds).')'),'goods_name,goods_image,goods_price,goods_marketprice,han_goods_common.goods_commonid,IFNULL(discount_price,han_goods_common.goods_price) AS goodsPrice',$activities);
......@@ -743,7 +743,7 @@ class StoreServiceModel extends \Business\AbstractModel{
$commonDAO = \DAO\GoodsCommonModel::getInstance();
//$activities = $this->isJoin($storeId,$memberId);
$activities = \DAO\SaleMemberModel::getInstance()->isJoinStore($storeId,$memberId);
if($activities === false){
if(empty($activities)){
$field = 'goods_commonid AS goodsCommonId,goods_name AS goodsName,goods_price as goodsPrice,goods_marketprice AS goodsMarketPrice,goods_image AS goodsImage,goods_jingle AS goodsCopywriting';
$list = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsCommonRedisModel::getInstance(),array(&$commonDAO, 'getGoodsList'),array($where,$field,$limit,$order),\Our\ApiConst::oneDaySecond,array($storeId));
}else{
......
File mode changed from 100755 to 100644
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