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

commit

www/protected/modules/common/controllers/ConfirmController.php

@@ -64,8 +64,11 @@ class ConfirmController extends CController{
                 }
                 $order->charge_id = $input_data['id'];
                 $order->pay_channel = $input_data['channel'];
+                if($order->final_price>$order->pay_price){
+                    $order->pay_channel = 'mix';
+                }
                 $order->status = 1;
-                if($order->update(array('charge_id','pay_channel','status'),true)){
+                if($order->update(array('charge_id','pay_channel','status','pay_channel'),true)){
                     $list = new ARedisList('o2o_after_pay_success');
                     $list->push(json_encode($input_data));
 

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

@@ -165,6 +165,10 @@ class  OrderController extends O2oBaseController{
             $balance_log->type = 'order';
             $balance_log->amount = $balance;
             $balance_log->save(true);
+
+            if($order->final_price>0){
+                $order->pay_channel = 'balance';
+            }
             $order->status = 1;
         }else{
             $order->status = 0;
@@ -260,6 +264,8 @@ class  OrderController extends O2oBaseController{
         }
         $str = isset($str)&&$str?$str:'上门';
         $amount = ceil($order->pay_price*1000)/10;
+
+
         $result = Service::factory('PayService')->Pay($pay_channel,$amount,(string)$order->_id,$str,$str,$user_obj->wx_pub_openid);
         if($result === false){
             CommonFn::requestAjax(false,'支付遇到点问题了，请稍候再试');