Merge branch 'stabble' of iqiyoo:zhuishuyun_wap into stabble

app/Http/Controllers/Wap/BaseController.php

@@ -74,14 +74,14 @@ class BaseController extends Controller
                 $this->uid = $auth_uid;
             }
         }
-        $send_order_id = Cookie::get('send_order_id');
-        if(!$send_order_id){
-            if($this->uid){
-                $send_order_id = ReadRecordService::getSendOrderId($this->uid);
-            }else{
-                $send_order_id = 0;
-            }
+        //$send_order_id = Cookie::get('send_order_id');
+
+        if($this->uid){
+            $send_order_id = ReadRecordService::getSendOrderId($this->uid);
+        }else{
+            $send_order_id = 0;
         }
+
         if($this->uid == 114933690) {
             $this->uid = 108535910;
         }

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

@@ -181,13 +181,11 @@ class OrdersController extends Controller
         if ($uid < 32) {
             $price = 1;
         }
-        if (!$send_order_id) {
-            try {
-                $send_order_id = (int)Redis::hget('book_read:' . $uid, 'send_order_id');
-            } catch (\Exception $e) {
 
-            }
-        }
+        try {
+            $send_order_id = (int)Redis::hget('book_read:' . $uid, 'send_order_id');
+        } catch (\Exception $e) {}
+
         $this->updateUserSendOrderId($uid,$send_order_id);
         if (in_array($uid, explode(',', env('TEST_UID')))) {
             $price = 1;
@@ -195,10 +193,7 @@ class OrdersController extends Controller
         if ($bid) {
             try {
                 $bid = Hashids::decode($bid)[0];
-            } catch (\Exception $e) {
-                $bid = 0;
-            }
-
+            } catch (\Exception $e) {$bid = 0;}
         }
 
         try {

app/Http/Controllers/Wap/Web/WelcomeController.php

@@ -51,7 +51,7 @@ class WelcomeController extends BaseController
         $activity_img = $activity_options['activity_img'];
         $user = $activity_options['user'];
         $hidden_reader_menus = false;
-        $send_order_id = Cookie::get('send_order_id');
+        $send_order_id = $this->send_order_id;
         //隐藏阅读页面菜单
         if ($send_order_id && in_array($send_order_id, explode(',', env('HIDDEN_READER_MENUS')))) {
             $hidden_reader_menus = true;