change

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

@@ -140,7 +140,7 @@ class BookController extends BaseController
     {
         // 获取基本数据
         $package     = $request->header('x-package', '');
-        $brand       = strtolower($request->header('x-nbrand', ''));
+        $brand       = $request->header('x-nbrand', '');
         $codeVersion = $request->header('x-codeversion', '');
 
         // 根据包名、平台、版本号判断是否审核
@@ -242,7 +242,7 @@ class BookController extends BaseController
 
         // 审核状态默认值
         $package     = $request->header('x-package', '');
-        $brand       = strtolower($request->header('x-nbrand', ''));
+        $brand       = $request->header('x-nbrand', '');
         $codeVersion = $request->header('x-codeversion', '');
         if ($order_field === 'recommend_index' && Utils::checkIsAudit($package, $brand, $codeVersion)) {
             $order = ['id', 'desc'];

app/Http/Controllers/QuickApp/WelcomeController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\QuickApp;
 
 use App\Modules\AdPosition\Services\AdPositionService;
 use App\Modules\SendOrder\Models\QappSendOrder;
-use App\Modules\SendOrder\Models\QuickAppSendOrder;
 use App\Modules\User\Models\QappChannelAccount;
 use App\Modules\User\Services\QappPackageService;
 use Illuminate\Http\Request;
@@ -116,11 +115,11 @@ class WelcomeController extends BaseController
 
         // 获取派单信息
         $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/Utils.php

@@ -81,7 +81,7 @@ class Utils
     public static function checkIsAudit($package, $brand, $codeVersion): bool
     {
         $audit = getProp(config('audit'), $package, []);
-        if ($audit && $brand === getProp($audit, 'brand') && $codeVersion === getProp($audit, 'codeVersion')) {
+        if ($audit && $codeVersion === getProp($audit, 'codeVersion') && strtolower($brand) === getProp($audit, 'brand')) {
             return true;
         }