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

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

@@ -41,7 +41,7 @@ class  OrderController extends O2oBaseController{
             $order = ROrder::model()->findAll($criteria_user);
             $o = CommonFn::getRowsFromCursor($order);
             foreach($o as $value){
-                if ($value['status'] == 0){
+                if ($value['status'] == 0 || $value['status'] == -1){
                     $t = ROrder::model()->get($value['_id']);
                     $t->delete();
                 } else {