fly 5 years ago
parent
commit
1b83952595
1 changed files with 14 additions and 13 deletions
  1. 14 13
      app/Http/Controllers/Wap/Pay/OrdersController.php

+ 14 - 13
app/Http/Controllers/Wap/Pay/OrdersController.php

@@ -971,22 +971,23 @@ class OrdersController extends Controller
                         $page = 'pay.order.bindPhone';
                     }
                     $url = urldecode($request->input('redirect'));
-                    Log::info('redirect_url :' . $url);
-                    if (strpos($url, '/reader') !== false) {
-                        preg_match('bid=(\w+)', $url, $matchs);
-                        $bid = Hashids::decode($matchs[1])[0];
-                        $record =  ReadRecordService::getRecordByUidBid($uid, $bid);
-                        if ($record) {
-                            $cid = explode('_', $record)[0];
-                            $url = preg_replace('/cid=(\d+)/', 'cid=' . $cid, $url);
-                        } else {
-                            $url = preg_replace(['/bid=(\w+)/', '/\/reader?/'], ['', '/reader?id=' . $bid], $url);
-                        }
-                        Log::info('reader_url :' . $url);
-                    }
                     return view($page, compact('order', 'url', 'from'));
                 }
             } else {
+                $url = urldecode($request->input('redirect'));
+                Log::info('redirect_url :' . $url);
+                if (strpos($url, '/reader') !== false) {
+                    preg_match('bid=(\w+)', $url, $matchs);
+                    $bid = Hashids::decode($matchs[1])[0];
+                    $record =  ReadRecordService::getRecordByUidBid($uid, $bid);
+                    if ($record) {
+                        $cid = explode('_', $record)[0];
+                        $url = preg_replace('/cid=(\d+)/', 'cid=' . $cid, $url);
+                    } else {
+                        $url = preg_replace(['/bid=(\w+)/', '/\/reader?/'], ['', '/reader?id=' . $bid], $url);
+                    }
+                    Log::info('reader_url :' . $url);
+                }
                 return redirect($url);
             }
         }