|
@@ -651,11 +651,13 @@ class goodsModel extends Model
|
|
|
}
|
|
|
//抢购
|
|
|
if (C('groupbuy_allow')) {
|
|
|
+ Log::record("groupbuy_allow",Log::DEBUG);
|
|
|
$goods_info['groupbuy_info'] = Model('groupbuy')->getGroupbuyInfoByGoodsCommonID($goods_info['goods_commonid']);
|
|
|
}
|
|
|
|
|
|
//限时折扣
|
|
|
if (C('promotion_allow') && empty($goods_info['groupbuy_info'])) {
|
|
|
+ Log::record("groupbuy_allow",Log::DEBUG);
|
|
|
$goods_info['xianshi_info'] = Model('p_xianshi_goods')->getXianshiGoodsInfoByGoodsID($goods_info['goods_id']);
|
|
|
}
|
|
|
return $goods_info;
|