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

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

@@ -49,7 +49,7 @@ class  OrderController extends O2oBaseController{
             }*/
             foreach ($o as $value) {
                 if ($value['status'] == 0 || $value['status'] == -1) {
-                    $t = ROrder::model()->get($value['_id']);
+                    $t = ROrder::model()->get(new MongoId($value['_id']));
                     $t->delete();
                 } else {
                     CommonFn::requestAjax(false, '对不起，日常保洁两小时体验只能购买一单，你已经抢购过');

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

@@ -7,12 +7,21 @@ class  RechargeController extends O2oBaseController{
 
     public function actionTest(){
 
-        //$user = RUser::model()->get(new MongoId('57e238929f5160d6048b456d'));
+        $user = RUser::model()->get(new MongoId('57e38f1b9f5160ac048b457d'));
+        $num = intval(ceil((rand(100000, 999999))) / 10000);
+        $data = '{
+                        "touser": "' . $user->wx_pub_openid . '",
+                        "msgtype": "text",
+                        "text": {
+                        "content": "' . '恭喜您获得参与本次活动的权利1,' . $num . '为您参加本活动的号码,' . '"
+                        }
+                    }';
+        var_dump(CommonFn::sendWxMessage($data));
        // var_dump($user);exit;
-        $criteria = new EMongoCriteria();
+        //$criteria = new EMongoCriteria();
         //$criteria->status('==','1');
-        $criteria->price('==',1000);
-
+        //$criteria->price('==',1000);
+/*
         $cursor = RechargeOrder::model()->findAll($criteria);
         $orders = CommonFn::getRowsFromCursor($cursor);
         $user_ids = array();
@@ -64,9 +73,12 @@ class  RechargeController extends O2oBaseController{
                 $user_ids = array_unique($user_ids);
 
             }
-        }
+        }*/
         //end
-
+        $order = ROrder::model()->get(new MongoId('582e9e7d9f5160b1048b554c'));
+        $order->delete();
+        $order1 = ROrder::model()->get(new MongoId('5832546b9f5160a5048b58f9'));
+        $order1->delete();
 
 
     }