Merge branch 'master' of iqiyoo:zhuishuyun_wap

app/Http/Controllers/Wap/Pay/OrdersController.php

@@ -130,7 +130,7 @@ class OrdersController extends Controller
             $fromtype = 'main';
         }
 
-        if (!$openid) {
+        if (!$openid && !$p_channel_id && !$suid) {
             $transfer_channel_id = $this->transfer($distribution_channel_id);
             if ($transfer_channel_id) {
                 $p_channel_id = $distribution_channel_id;
@@ -344,6 +344,12 @@ class OrdersController extends Controller
 
         if (!isset($pay_info['appId']) || !isset($pay_info['package'])) {
             //支付异常
+            myLog('order')->info('pay error start---------------------------------');
+            myLog('order')->info($pay_info);
+            myLog('order')->info($request->all());
+            myLog('order')->info('order info  is');
+            myLog('order')->info($init_order);
+            myLog('order')->info('pay error end-----------------------------------');
             $this->payAlert($channel->pay_merchant_id, $trade_no, $pay_info);
         }
         $pay_info['pay_redirect_url'] = urldecode($pay_redirect_url);