Merge branch 'kuaiyingyong' into quickapp_fly

app/Http/Controllers/QuickApp/Activity/ActivityController.php

@@ -14,6 +14,7 @@ use App\Modules\SendOrder\Models\QappSendOrder;
 use App\Modules\SendOrder\Models\QuickAppSendOrder;
 use App\Modules\Subscribe\Services\OrderService;
 use App\Modules\User\Models\QappChannelAccount;
+use App\Modules\User\Models\User;
 use Illuminate\Http\Request;
 use App\Http\Controllers\QuickApp\BaseController;
 use Redis;
@@ -204,8 +205,11 @@ class ActivityController extends BaseController
             Utils::throwError(ErrorConst::ACTIVITY_NOT_FOUND);
         }
 
+        // 获取用户信息
+        $user        = User::getUser($this->uid);
+        $sendOrderId = getProp($user, 'send_order_id');
+        
         // 用户派单的信息是否跟创建该活动的子账号一致
-        $sendOrderId   = $this->send_order_id;
         $qappAccountId = (int)getProp($activity, 'qapp_account_id');
         if ($qappAccountId && $sendOrderId) {
             $sendOrder   = QappSendOrder::getSendOrderById($sendOrderId);

app/Http/Controllers/QuickApp/WelcomeController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\QuickApp;
 use App\Modules\AdPosition\Services\AdPositionService;
 use App\Modules\SendOrder\Models\QappSendOrder;
 use App\Modules\User\Models\QappChannelAccount;
+use App\Modules\User\Models\User;
 use App\Modules\User\Services\QappPackageService;
 use Illuminate\Http\Request;
 use App\Modules\OfficialAccount\Services\CustomMsgService;
@@ -116,20 +117,23 @@ class WelcomeController extends BaseController
     public function getOptions(Request $request)
     {
         // 获取包名
-        $package     = $request->header('x-package', '');
-        $sendOrderId = $request->header('send-order-id', '');
+        $package = $request->header('x-package', '');
 
         // 获取客服信息
         $supports = config('option.supports');
         $support  = getProp($supports, $package, (object)[]);
 
+        // 获取用户信息
+        $user        = User::getUser($this->uid);
+        $sendOrderId = getProp($user, 'send_order_id');
+
         // 获取派单信息
         $adPositions = [];
-//        if ($sendOrderId) {
-//            $sendOrder      = QappSendOrder::getSendOrderById($sendOrderId);
-//            $channelAccount = QappChannelAccount::getByAccount(getProp($sendOrder, 'account'));
-//            $adPositions    = AdPositionService::getInstance()->getAdPositions($this->uid, getProp($channelAccount, 'id'));
-//        }
+        if ($sendOrderId) {
+            $sendOrder      = QappSendOrder::getSendOrderById($sendOrderId);
+            $channelAccount = QappChannelAccount::getByAccount(getProp($sendOrder, 'account'));
+            $adPositions    = AdPositionService::getInstance()->getAdPositions($this->uid, getProp($channelAccount, 'id'));
+        }
 
         // 配置
         $data = [

app/Libs/Push/VPush/VivoPushCommon.php

@@ -0,0 +1,10 @@
+<?php
+
+
+namespace App\Libs\Push\VPush;
+
+
+class VivoPushCommon
+{
+
+}

app/Modules/AdPosition/Services/AdPositionService.php

@@ -44,9 +44,8 @@ class AdPositionService
         $dispatches = collect($dispatches)->groupBy('ad_position_id')->all();
         foreach ($positions as $position) {
             // 相关变量获取
-            $positionId        = getProp($position, 'id');
-            $ident             = getProp($position, 'ident');
-            $filterContentJson = getProp($position, 'filter_condition');
+            $positionId = getProp($position, 'id');
+            $ident      = getProp($position, 'ident');
 
             // 获取优先级最高的任务
             $validDispatches = getProp($dispatches, $positionId, []);
@@ -56,7 +55,8 @@ class AdPositionService
             }
 
             // 过滤条件判断
-            $matchFilter = $this->filterDispatch($uid, $filterContentJson);
+            $filterContentJson = getProp($validDispatch, 'filter_condition');
+            $matchFilter       = $this->filterDispatch($uid, $filterContentJson);
             if (!$matchFilter) {
                 continue;
             }

app/Modules/Trade/Models/Order.php

@@ -467,6 +467,7 @@ class Order extends Model
             return [];
         }
 
-        return self::where('uid', $uid)->where('status', 'PIAD')->orderBy('id')->limit(1)->get();
+        $result = self::where('uid', $uid)->where('status', 'PAID')->orderBy('id')->limit(1)->get();
+        return $result ? $result->toArray() : [];
     }
 }

config/push.php

@@ -27,6 +27,7 @@ return [
             'getAllTags'       => 'https://api-device.push.heytapmobi.com/server/v1/device/get_all_tags',
             'getInvalidRegIds' => 'https://feedback.push.oppomobile.com/server/v1/feedback/fetch_invalid_regidList',
             'fetchPushPermit'  => 'https://feedback.push.oppomobile.com/server/v1/feedback/fetch_push_permit',
-        ]
+        ],
+        'vivo'   => []
     ]
 ];