Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/protected/modules/o2o/controllers/OrderController.php

@@ -31,7 +31,7 @@ class  OrderController extends O2oBaseController{
             //}
         }
         //双十一活动暂用  start 判断用户是否购买过
-      /*  $doubleEleventId = '581fe5a6a84ea0e36c8b45bb';
+        /*$doubleEleventId = '581fe5a6a84ea0e36c8b45bb';
         if($products[0]['product'] == $doubleEleventId) {
             $criteria_user = new EMongoCriteria();
             $criteria_user->user('==', new MongoId($user_id));
@@ -53,7 +53,7 @@ class  OrderController extends O2oBaseController{
             $total = 0;
             foreach ($rows as $orders) {
                 //判断订单是否达到111单
-                if ($total > 111) {
+                if ($total > 2) {
                     CommonFn::requestAjax(false, '今天的双11订单已经抢购光了');
                 }
                 //判断是否是当天订单