修复回调问题

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

@@ -144,6 +144,8 @@ class OrdersController extends Controller
         if (empty($openid)) {
             $trade_no = date("YmdHis") . hexdec(uniqid());
             $params = compact('uid', 'product_id', 'distribution_channel_id', 'send_order_id', 'bid', 'trade_no', 'pay_redirect_url', 'fromtype', 'activity_id', 'n','suid');
+            $params['pay_redirect_url'] = urlencode($params['pay_redirect_url']);//否则重定向回来数据丢失
+
             $redirect_url = env('CREATE_PAY_URL') . '?' . http_build_query($params);
             //$redirect_url  = env('CREATE_PAY_URL').'?uid='.$uid.'&product_id='.$product_id.'&distribution_channel_id='
             // .$distribution_channel_id.'&send_order_id='.$send_order_id.'&bid='.$bid.'&pay_redirect_url='.urlencode($pay_redirect_url)
@@ -311,9 +313,9 @@ class OrdersController extends Controller
             $this->payAlert($channel->pay_merchant_id, $trade_no, $pay_info);
         }
         $pay_info['pay_redirect_url'] = urldecode($pay_redirect_url);
-        if ($request->has('cid')) {
-            $pay_info['pay_redirect_url'] = $pay_info['pay_redirect_url'] . '&cid=' . $request->input('cid');
-        }
+//        if ($request->has('cid')) {
+//            $pay_info['pay_redirect_url'] = $pay_info['pay_redirect_url'] . '&cid=' . $request->input('cid');
+//        }
 //        if ($hash_bid) {
 //            $pay_info['pay_redirect_url'] = $pay_info['pay_redirect_url'] . '&bid=' . $hash_bid;
 //        }