From 9a60e35749e4783d33bab90a99b8f832dbeb202e Mon Sep 17 00:00:00 2001 From: hgc Date: Mon, 3 Mar 2025 20:48:44 +0800 Subject: [PATCH] =?UTF-8?q?report=E8=B0=83=E7=94=A8=E5=B9=BF=E5=91=8A?= =?UTF-8?q?=E5=88=86=E6=9E=90=E6=95=B0=E6=8D=AE=E8=81=9A=E5=90=88=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E6=9B=B4=E6=96=B04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/BpsAdController.php | 29 ++++++++++++++++++++++++++--- config/route.php | 4 +--- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/app/controller/BpsAdController.php b/app/controller/BpsAdController.php index f137fec..662bc0b 100644 --- a/app/controller/BpsAdController.php +++ b/app/controller/BpsAdController.php @@ -103,7 +103,7 @@ class BpsAdController $parts = explode('#', $metric); if (count($parts) !== 4) continue; - [$sourceType, $platform, $field] = $parts; + [$sourceType, $platform, $field, $format] = $parts; $sourceType = strtolower($sourceType); $platformKey = strtolower($platform); @@ -158,11 +158,12 @@ class BpsAdController { $options = $request->all(); $options['jwtClaims'] = $request->jwtClaims; - $options['rpc'] = $request->rpc ?? false; + $options['rpc'] = (bool)true; if ($options['rpc']) { //$options['conditions']['startDate']由2025-02-14处理成纯整数 $options['conditions']['startDate'] = (int)str_replace('-', '', $options['conditions']['startDate']); $options['conditions']['endDate'] = (int)str_replace('-', '', $options['conditions']['endDate']); + $options['jwtClaims'] = $options['conditions']['user']; } @@ -181,6 +182,9 @@ class BpsAdController $accounts = $this->bpsAdAccountService->getAllAdAccounts(['merchant_id' => $options['jwtClaims']['merchant_id'], 'platform' => $platformType]); if (empty($accounts)) { + if ($options['rpc']) { + return []; + } return $this->successResponse(['data' => []], $request); } // dump($accounts); @@ -219,6 +223,7 @@ class BpsAdController //$options['conditions']['startDate']由2025-02-14处理成纯整数 $options['conditions']['startDate'] = (int)str_replace('-', '', $options['conditions']['startDate']); $options['conditions']['endDate'] = (int)str_replace('-', '', $options['conditions']['endDate']); + $options['jwtClaims'] = $options['conditions']['user']; } // 获取请求参数 @@ -236,6 +241,9 @@ class BpsAdController $accounts = $this->bpsAdAccountService->getAllAdAccounts(['merchant_id' => $options['jwtClaims']['merchant_id'], 'platform' => $platformType]); if (empty($accounts)) { + if ($options['rpc']) { + return []; + } return $this->successResponse(['data' => []], $request); } @@ -267,11 +275,12 @@ class BpsAdController { $options = $request->all(); $options['jwtClaims'] = $request->jwtClaims; - $options['rpc'] = $request->rpc ?? false; + $options['rpc'] = (bool)true; if ($options['rpc']) { //$options['conditions']['startDate']由2025-02-14处理成纯整数 $options['conditions']['startDate'] = (int)str_replace('-', '', $options['conditions']['startDate']); $options['conditions']['endDate'] = (int)str_replace('-', '', $options['conditions']['endDate']); + $options['jwtClaims'] = $options['conditions']['user']; } // 获取请求参数 @@ -288,6 +297,9 @@ class BpsAdController $accounts = $this->bpsAdAccountService->getAllAdAccounts(['merchant_id' => $options['jwtClaims']['merchant_id'], 'platform' => $platformType]); if (empty($accounts)) { + if ($options['rpc']) { + return []; + } return $this->successResponse(['data' => []], $request); } @@ -540,6 +552,7 @@ class BpsAdController //$options['conditions']['startDate']由2025-02-14处理成纯整数 $options['conditions']['startDate'] = (int)str_replace('-', '', $options['conditions']['startDate']); $options['conditions']['endDate'] = (int)str_replace('-', '', $options['conditions']['endDate']); + $options['jwtClaims'] = $options['conditions']['user']; } // 获取请求参数 @@ -557,6 +570,9 @@ class BpsAdController $accounts = $this->bpsAdAccountService->getAllAdAccounts(['merchant_id' => $options['jwtClaims']['merchant_id'], 'platform' => $platformType]); if (empty($accounts)) { + if ($options['rpc']) { + return []; + } return $this->successResponse(['data' => []], $request); } @@ -592,6 +608,7 @@ class BpsAdController //$options['conditions']['startDate']由2025-02-14处理成纯整数 $options['conditions']['startDate'] = (int)str_replace('-', '', $options['conditions']['startDate']); $options['conditions']['endDate'] = (int)str_replace('-', '', $options['conditions']['endDate']); + $options['jwtClaims'] = $options['conditions']['user']; } // 获取请求参数 @@ -609,6 +626,9 @@ class BpsAdController $accounts = $this->bpsAdAccountService->getAllAdAccounts(['merchant_id' => $options['jwtClaims']['merchant_id'], 'platform' => $platformType]); if (empty($accounts)) { + if ($options['rpc']) { + return []; + } return $this->successResponse(['data' => []], $request); } @@ -713,6 +733,9 @@ class BpsAdController $options = $request->all(); $options['jwtClaims'] = $request->jwtClaims; $options['rpc'] = $request->rpc ?? false; + if ($options['rpc']) { + $options['jwtClaims'] = $options['conditions']['user']; + } // 获取请求参数 $cycle = $options['conditions']['dateType'] ?? 'today'; //默认today || today yesterday、month、year 、custom diff --git a/config/route.php b/config/route.php index a83c218..b12b7b5 100644 --- a/config/route.php +++ b/config/route.php @@ -106,9 +106,7 @@ Route::group('/marketing', function () { ]); Route::group('/notice', function () { Route::post('/aggregate', [BpsAdController::class, 'aggregateAd']); - })->middleware([ - app\middleware\JwtLocal::class, - ]); + }); Route::group('/customer', function () { Route::get('/handle_binding', [CustomerController::class, 'handleBindingNew']); //绑定接口 Route::post('/bind', [CustomerController::class, 'bind']); //绑定接口