add to local

data/logic/buy_1.logic.php

@@ -200,9 +200,11 @@ class buy_1Logic
      * @param array $goods_info
      * @param number $quantity 购买数量
      */
-    public function getXianshiInfo( & $goods_info, $quantity) {
+    public function getXianshiInfo( & $goods_info, $quantity)
+    {
         if (empty($quantity)) $quantity = 1;
         if (!C('promotion_allow') || empty($goods_info['xianshi_info'])) return ;
+
         $goods_info['xianshi_info']['down_price'] = ncPriceFormat($goods_info['goods_price'] - $goods_info['xianshi_info']['xianshi_price']);
         if ($quantity >= $goods_info['xianshi_info']['lower_limit']) {
             $goods_info['goods_price'] = $goods_info['xianshi_info']['xianshi_price'];
@@ -872,8 +874,9 @@ class buy_1Logic
      * 直接购买时，判断商品是不是正在抢购中，如果是，按抢购价格计算，购买数量若超过抢购规定的上限，则按抢购上限计算
      * @param array $goods_info
      */
-    public function getGroupbuyInfo(& $goods_info = array()) {
-        if (!C('groupbuy_allow') || empty($goods_info['groupbuy_info'])) return ;
+    public function getGroupbuyInfo(& $goods_info = array())
+    {
+        if (!C('groupbuy_allow') || empty($goods_info['groupbuy_info'])) return;
         $groupbuy_info = $goods_info['groupbuy_info'];
 
         $goods_info['goods_price'] = $groupbuy_info['groupbuy_price'];
@@ -883,23 +886,23 @@ class buy_1Logic
         $goods_info['upper_limit'] = $groupbuy_info['upper_limit'];
         $goods_info['promotions_id'] = $goods_info['groupbuy_id'] = $groupbuy_info['groupbuy_id'];
         $goods_info['ifgroupbuy'] = true;
-		//v3-b10 
-		//$goods_model=Model('order');
+        //v3-b10
+        //$goods_model=Model('order');
         //todo 抢购商品取消订单后，不让购买，如果要修改，改这行代码就可以了
-		  $ordergoods=Model()->table('order_goods')->where(array('buyer_id'=>$_SESSION['member_id'],'goods_type'=>2,'promotions_id'=>$groupbuy_info['groupbuy_id']))->sum('goods_num');
-		  if(!empty($ordergoods)&&intval($ordergoods)>0)
-		  {
-		   $tnum=intval($groupbuy_info['upper_limit'])-intval($ordergoods);//-intval($goods_info['goods_num']);
-		   if($tnum<=0)
-			$goods_info=null;
-			//return;
-		   else{
-			if($goods_info['goods_num']>$tnum){
-			 $goods_info['goods_num'] = $tnum;
-			}
-		   }
-		  }
-		//end
+        $ordergoods = Model()->table('order_goods')->where(array('buyer_id' => $_SESSION['member_id'], 'goods_type' => 2, 'promotions_id' => $groupbuy_info['groupbuy_id']))->sum('goods_num');
+        if (!empty($ordergoods) && intval($ordergoods) > 0)
+        {
+            $tnum = intval($groupbuy_info['upper_limit']) - intval($ordergoods);//-intval($goods_info['goods_num']);
+            if ($tnum <= 0)
+                $goods_info = null;
+            //return;
+            else {
+                if ($goods_info['goods_num'] > $tnum) {
+                    $goods_info['goods_num'] = $tnum;
+                }
+            }
+        }
+        //end
     }
 
     /**
@@ -991,9 +994,10 @@ class buy_1Logic
      *  直接购买时，判断商品是不是正在抢购中，如果是，按抢购价格计算，购买数量若超过抢购规定的上限，则按抢购上限计算
      * @param array $cart_list
      */
-    public function getGroupbuyCartList(& $cart_list) {
+    public function getGroupbuyCartList(& $cart_list)
+    {
         if (!C('promotion_allow') || empty($cart_list)) return ;
-        $model_goods = Model('goods');
+
         foreach ($cart_list as $key => $cart_info) {
             if ($cart_info['bl_id'] === '1' || empty($cart_info['groupbuy_info'])) continue;
             $this->getGroupbuyInfo($cart_info);
@@ -1006,8 +1010,10 @@ class buy_1Logic
      * 并标识该商品为限时商品
      * @param array $cart_list
      */
-    public function getXianshiCartList(& $cart_list) {
+    public function getXianshiCartList(& $cart_list)
+    {
         if (!C('promotion_allow') || empty($cart_list)) return ;
+
         foreach ($cart_list as $key => $cart_info) {
             if ($cart_info['bl_id'] === '1' || empty($cart_info['xianshi_info'])) continue;
             $this->getXianshiInfo($cart_info, $cart_info['goods_num']);

data/model/goods.model.php

@@ -700,14 +700,17 @@ class goodsModel extends Model
             return array();
         }
         //抢购
-        if (C('groupbuy_allow')) {
+        if (C('groupbuy_allow'))
+        {
             $goods_info['groupbuy_info'] = Model('groupbuy')->getGroupbuyInfoByGoodsCommonID($goods_info['goods_commonid']);
         }
 
         //限时折扣
-        if (C('promotion_allow') && empty($goods_info['groupbuy_info'])) {
+        if (C('promotion_allow') && empty($goods_info['groupbuy_info']))
+        {
             $goods_info['xianshi_info'] = Model('p_xianshi_goods')->getXianshiGoodsInfoByGoodsID($goods_info['goods_id']);
         }
+
         return $goods_info;
     }
 

mobile/control/cart.php

@@ -461,7 +461,8 @@ class cartControl extends mobileControl
         if(intval($goods_info['goods_storage']) < $quantity) {
             return array('code' => errcode::ErrStorageShort, 'msg' => errcode::msg(errcode::ErrStorageShort));
         }
-        if ($goods_info['is_virtual'] || $goods_info['is_fcode'] || $goods_info['is_presell']) {
+        //if ($goods_info['is_virtual'] || $goods_info['is_fcode'] || $goods_info['is_presell']) {
+        if ($goods_info['is_virtual'] || $goods_info['is_presell']) {
             return array('code' => errcode::ErrGoodsSpecial, 'msg' => errcode::msg(errcode::ErrGoodsSpecial));
         }