'fix'

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

@@ -14,7 +14,6 @@ use App\Modules\RecommendBook\Services\QappRecommendService;
 use App\Modules\RecommendBook\Services\RecommendService;
 use App\Modules\Book\Services\RecoBannerService;
 use App\Modules\Subscribe\Models\Order;
-use App\Modules\Trade\Services\OrderService;
 use App\Modules\User\Models\ChannelAdUser;
 use App\Modules\User\Models\QappPackage;
 use App\Modules\User\Services\QappUserService;
@@ -32,6 +31,7 @@ use App\Modules\Book\Services\ChapterService;
 use App\Modules\Subscribe\Services\BookOrderService;
 use App\Modules\Subscribe\Services\ChapterOrderService;
 use App\Modules\Subscribe\Services\YearOrderService;
+use App\Modules\Subscribe\Services\OrderService;
 use App\Modules\User\Services\ReadRecordService;
 use Hashids;
 use Log;
@@ -1030,11 +1030,11 @@ class BookController extends BaseController
      */
     public function getAdvertOrders(Request $request)
     {
-        $order_id = $request->get('order_id','');
+        $trade_no = $request->get('trade_no','');
         $uid = $this->uid;
         $distribution_id = $this->distribution_channel_id;
         $cacheKey = 'advertisement:uid:'.$uid.':id';
-        if(empty($order_id)){
+        if(empty($trade_no)){
             return response()->success();
         }
         $channel_ad_id = 0;
@@ -1044,7 +1044,7 @@ class BookController extends BaseController
                 //获取广告id
                 $channel_ad_id = Redis::get($cacheKey);
                 //判断订单跟广告是否有关系
-                $order = Order::find($order_id);
+                $order = OrderService::getByTradeNo($trade_no);
                 if(!$order){
                     return response()->success();
                 }
@@ -1096,7 +1096,7 @@ class BookController extends BaseController
                 DB::table('channel_advert_orders')->insert(compact('order_id','uid','distribution_id','channel_ad_id','type','created_at','updated_at'));
             } catch (\Exception $e) {
                 \Log::info('绑定广告和订单失败'.$e->getMessage());
-                \Log::info('order_id:'.$order_id.' uid:'.$uid.' distribution_id:'.$distribution_id.' channel_ad_id:'.$channel_ad_id);
+                \Log::info('order_id:'.$trade_no.' uid:'.$uid.' distribution_id:'.$distribution_id.' channel_ad_id:'.$channel_ad_id);
             }
         }
         return response()->success();

app/Modules/Subscribe/Services/OrderService.php

@@ -25,6 +25,16 @@ class OrderService
         return Order::where('uid',$uid)->where('from_type','!=','order_add')->count();
     }
 
+    public static function getUserLastestOrder($uid)
+    {
+        if (empty($uid)) {
+            return [];
+        }
+
+        $result = Order::where('uid', $uid)->where('status', 'PAID')->orderBy('id')->limit(1)->get();
+        return $result ? $result->toArray() : [];
+    }
+
     /**
      * 获取充值订单
      * @param $uid

app/Modules/Trade/Services/OrderService.php

@@ -210,9 +210,4 @@ class OrderService
     {
         return Order::getOrdersByActivityId($channelId, $createdAt, $activityId);
     }
-
-    public static function getUserLastestOrder($uid)
-    {
-        return Order::getUserLastestOrder($uid);
-    }
 }