'fix'

app/Http/Controllers/QuickApp/Book/BookController.php

@@ -188,14 +188,8 @@ class BookController extends BaseController
             }
             return $item;
         });
-<<<<<<< HEAD
-//        $user =  (new QappUserService)->getGolableUser();
-=======
         $user =  (new QappUserService)->getGolableUser();
         if(isset($user->uid) && !empty($user->uid)){
->>>>>>> dd0b5be4b77a37d19725667dad0cdf401d8f7c16
-
-        if($this->user_info){
 
             if(!$this->send_order_id || $this->send_order_id == 0 ){
                 \Log::info('un_send_order_book:uid:'.$this->uid);