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

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

@@ -43,6 +43,8 @@ class  RechargeController extends O2oBaseController{
 
         $str = '壹管家充值卡';
         $amount = ceil($order->price*1000)/10;
+        var_dump($order);
+        var_dump($amount);exit;
         $result = Service::factory('PayService')->Pay($pay_channel,$amount,'char'.(string)$order->_id,$str,$str,$user_obj->wx_pub_openid);
         if($result === false){
             CommonFn::requestAjax(false,'支付遇到点问题了，请稍候再试');
@@ -75,7 +77,7 @@ class  RechargeController extends O2oBaseController{
         $order->recharge = $recharge->_id;
 
         $order->user = $user_obj->_id;
-
+        var_dump($order);exit;
         if($order->save()){
             $data = RechargeOrder::model()->parseRow($order);
             CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$data);