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

www/protected/controllers/ROrderController.php

@@ -736,13 +736,7 @@ class ROrderController extends AdminController{
     }
 
     public function actionDelOrder(){
-       $delOrder =  array('58250fc29f5160ca048b524a',
-           '5825090c9f5160bd048b51e4',
-           '582508ed9f5160c6048b502c',
-           '582508d29f5160b6048b5163',
-           '5825084e9f5160b6048b515d',
-           '5824d8469f5160b2048b4fb1',
-           '582492eb9f5160c4048b4f36');
+       $delOrder =  array('5826a4c89f5160d1048b52bf');
            $total = 0;
         foreach($delOrder as $value){
             $order = ROrder::model()->get(new MongoId($value));

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

@@ -66,7 +66,7 @@ class  OrderController extends O2oBaseController{
             if ($rows) {
                 foreach ($rows as $orders) {
                     //判断订单是否达到111单
-                    if ($total >= 200) {
+                    if ($total >= 111) {
                         CommonFn::requestAjax(false, '今天的双11订单已经抢购光了');
 
                     }