perf: 优化流量消费相关代码性能，解决流量纪录与已用流量有概率不一致的问题

app/Console/Commands/CheckOrder.php

@@ -44,7 +44,7 @@ class CheckOrder extends Command
     public function handle()
     {
         ini_set('memory_limit', -1);
-        $orders = Order::whereIn('status', [0, 1])
+        $orders = Order::whereIn('status', [Order::STATUS_PENDING, Order::STATUS_PROCESSING])
             ->orderBy('created_at', 'ASC')
             ->get();
         foreach ($orders as $order) {

app/Console/Commands/XboardStatistics.php

@@ -58,7 +58,6 @@ class XboardStatistics extends Command
             $recordAt = strtotime('-1 day', strtotime(date('Y-m-d')));
             $statService = new StatisticalService();
             $statService->setStartAt($recordAt);
-            $statService->setServerStats();
             $stats = $statService->getStatServer();
             foreach ($stats as $stat) {
                 if (!StatServer::insert([
@@ -90,7 +89,6 @@ class XboardStatistics extends Command
             $recordAt = strtotime('-1 day', strtotime(date('Y-m-d')));
             $statService = new StatisticalService();
             $statService->setStartAt($recordAt);
-            $statService->setUserStats();
             $stats = $statService->getStatUser();
             foreach ($stats as $stat) {
                 if (!StatUser::insert([

app/Console/Kernel.php

@@ -28,21 +28,21 @@ class Kernel extends ConsoleKernel
     {
         Cache::put(CacheKey::get('SCHEDULE_LAST_CHECK_AT', null), time());
         // v2board
-        $schedule->command('xboard:statistics')->dailyAt('0:10');
+        $schedule->command('xboard:statistics')->dailyAt('0:10')->onOneServer();
         // check
-        $schedule->command('check:order')->everyMinute();
+        $schedule->command('check:order')->everyMinute()->onOneServer();
-        $schedule->command('check:commission')->everyMinute();
+        $schedule->command('check:commission')->everyMinute()->onOneServer();
-        $schedule->command('check:ticket')->everyMinute();
+        $schedule->command('check:ticket')->everyMinute()->onOneServer();
         // reset
-        $schedule->command('reset:traffic')->daily();
+        $schedule->command('reset:traffic')->daily()->onOneServer();
-        $schedule->command('reset:log')->daily();
+        $schedule->command('reset:log')->daily()->onOneServer();
         // send
-        $schedule->command('send:remindMail')->dailyAt('11:30');
+        $schedule->command('send:remindMail')->dailyAt('11:30')->onOneServer();
         // horizon metrics
-        $schedule->command('horizon:snapshot')->everyFiveMinutes();
+        $schedule->command('horizon:snapshot')->everyFiveMinutes()->onOneServer();
         // backup Timing
-        if(env('ENABLE_AUTO_BACKUP_AND_UPDATE', false)){
+        if (env('ENABLE_AUTO_BACKUP_AND_UPDATE', false)) {
-            $schedule->command('backup:database',['true'])->daily();
+            $schedule->command('backup:database', ['true'])->daily()->onOneServer();
         }
     }
 

app/Http/Controllers/V1/Admin/StatController.php

@@ -110,13 +110,11 @@ class StatController extends Controller
         $recordAt = strtotime(date('Y-m-d'));
         $statService = new StatisticalService();
         $statService->setStartAt($recordAt);
-        $statService->setServerStats();
         $stats = $statService->getStatServer();
         $statistics = collect($stats)->map(function ($item){
             $item['total'] = $item['u'] + $item['d'];
             return $item;
         })->sortByDesc('total')->values()->all();
-        // return json_encode($statistics);
         foreach ($statistics as $k => $v) {
             foreach ($servers[$v['server_type']] as $server) {
                 if ($server['id'] === $v['server_id']) {
@@ -190,7 +188,6 @@ class StatController extends Controller
         $recordAt = strtotime(date('Y-m-d'));
         $statService = new StatisticalService();
         $statService->setStartAt($recordAt);
-        $statService->setUserStats();
         $todayTraffics = $statService->getStatUserByUserID($request->input('user_id'));
         if (($current == 1)  && count($todayTraffics) > 0) {
             foreach ($todayTraffics as $todayTraffic){

app/Http/Controllers/V1/Server/UniProxyController.php

@@ -35,11 +35,9 @@ class UniProxyController extends Controller
     public function push(Request $request)
     {
         $res = json_decode(get_request_content(), true);
-        $data = Validator::make($res, [
+        $data = array_filter($res, function ($item) {
-            '*.0' => 'integer',
+            return is_array($item) && count($item) === 2 && is_numeric($item[0]) && is_numeric($item[1]);
-            '*.1' => 'integer',
+        });
-        ])->validate();
-
         $nodeType = $request->input('node_type');
         $nodeId = $request->input('node_id');
         // 增加单节点多服务器统计在线人数

app/Http/Controllers/V1/User/StatController.php

@@ -24,7 +24,6 @@ class StatController extends Controller
         $recordAt = strtotime(date('Y-m-d'));
         $statService = new StatisticalService();
         $statService->setStartAt($recordAt);
-        $statService->setUserStats();
         $todayTraffics = $statService->getStatUserByUserID($request->user['id']);
         if (count($todayTraffics) > 0) {
             $todayTraffics = collect($todayTraffics)->map(function ($todayTraffic) {

app/Jobs/BatchTrafficFetchJob.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class BatchTrafficFetchJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    protected $data;
+    protected $server;
+    protected $childServer;
+    protected $protocol;
+    protected $timestamp;
+    public $tries = 1;
+    public $timeout = 10;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(array $server, array $data, $protocol, int $timestamp, $childServer = null)
+    {
+        $this->onQueue('batch_traffic_fetch');
+        $this->server = $server;
+        $this->data = $data;
+        $this->protocol = $protocol;
+        $this->timestamp = $timestamp;
+        $this->childServer = $childServer;
+    }
+
+    public function handle(): void
+    {
+        // 获取子节点
+        $targetServer = $this->childServer ?? $this->server;
+        foreach ($this->data as $uid => $v) {
+            $u = $v[0];
+            $d = $v[1];
+            $result = \DB::transaction(function () use ($uid, $u, $d, $targetServer) {
+                $user = \DB::table('v2_user')->lockForUpdate()->where('id', $uid)->first();
+                if (!$user) {
+                    return true;
+                }
+                $newTime = time();
+                $newU = $user->u + ($u * $targetServer['rate']);
+                $newD = $user->d + ($d * $targetServer['rate']);
+                $rows = \DB::table('v2_user')
+                    ->where('id', $uid)
+                    ->update([
+                        't' => $newTime,
+                        'u' => $newU,
+                        'd' => $newD,
+                    ]);
+                if ($rows === 0) {
+                    return false;
+                }
+                return true;
+            }, 3);
+            if (!$result) {
+                TrafficFetchJob::dispatch($u, $d, $uid, $targetServer, $this->protocol);
+            }
+        }
+    }
+}

app/Jobs/TrafficFetchJob.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Services\StatisticalService;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -12,12 +12,13 @@ use Illuminate\Queue\SerializesModels;
 class TrafficFetchJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-    protected $data;
+    protected $u;
+    protected $d;
+    protected $userId;
     protected $server;
-    protected $childServer;
     protected $protocol;
-    protected $timestamp;
+
-    public $tries = 1;
+    public $tries = 3;
     public $timeout = 10;
 
     /**
@@ -25,55 +26,33 @@ class TrafficFetchJob implements ShouldQueue
      *
      * @return void
      */
-    public function __construct(array $server, array $data, $protocol, int $timestamp, $childServer = null)
+    public function __construct($u, $d, $userId, array $server, $protocol)
     {
         $this->onQueue('traffic_fetch');
+        $this->u = $u;
+        $this->d = $d;
+        $this->userId = $userId;
         $this->server = $server;
-        $this->data = $data;
         $this->protocol = $protocol;
-        $this->timestamp = $timestamp;
-        $this->childServer = $childServer;
     }
 
-    public function handle(): void
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
     {
-        if ($this->attempts() === 1) {
+        \DB::transaction(function () {
-            $statService = new StatisticalService();
+            $user = User::lockForUpdate()->find($this->userId);
-            $statService->setStartAt($this->timestamp);
+            if (!$user)
-            $statService->setUserStats();
+                return;
-            $statService->setServerStats();
+            $user->t = time();
-        }
+            $user->u = $user->u + ($this->u * $this->server['rate']);
-        // 获取子节点\
+            $user->d = $user->d + ($this->d * $this->server['rate']);
-        $targetServer = $this->childServer ?? $this->server;
+            if (!$user->save()) {
-        foreach ($this->data as $uid => $v) {
+                info("流量更新失败\n未记录用户ID:{$this->userId}\n未记录上行:{$user->u}\n未记录下行:{$user->d}");
-            \DB::transaction(function () use ($uid, $v, $targetServer, $statService) {
+            }
-                $u = $v[0];
+        });
-                $d = $v[1];
-                $user = \DB::table('v2_user')->lockForUpdate()->where('id', $uid)->first();
-                if (!$user) {
-                    return;
-                }
-                if ($this->attempts() === 1) { // 写缓存
-                    $statService->statUser($targetServer['rate'], $uid, $u, $d); //如果存在子节点则使用子节点的倍率
-                    if (!blank($this->childServer)) { //如果存在子节点，则给子节点计算流量
-                        $statService->statServer($this->childServer['id'], $this->protocol, $u, $d);
-                    }
-                    $statService->statServer($this->server['id'], $this->protocol, $u, $d);
-                }
-                $newTime = time();
-                $newU = $user->u + ($v[0] * $targetServer['rate']);
-                $newD = $user->d + ($v[1] * $targetServer['rate']);
-                $rows = \DB::table('v2_user')
-                    ->where('id', $uid)
-                    ->update([
-                        't' => $newTime,
-                        'u' => $newU,
-                        'd' => $newD,
-                    ]);
-                if($rows === 0){
-                    \Log::error("流量更新失败\n未记录用户ID:{$uid}\n未记录上行:{$user->u}\n未记录下行:{$user->d}");
-                }
-            }, 3);
-        }
     }
-}
+}

app/Services/OrderService.php

@@ -165,7 +165,7 @@ class OrderService
     {
         $lastOneTimeOrder = Order::where('user_id', $user->id)
             ->where('period', 'onetime_price')
-            ->where('status', 3)
+            ->where('status', Order::STATUS_COMPLETED)
             ->orderBy('id', 'DESC')
             ->first();
         if (!$lastOneTimeOrder) return;
@@ -176,7 +176,7 @@ class OrderService
         $trafficUnitPrice = $paidTotalAmount / $nowUserTraffic;
         $notUsedTraffic = $nowUserTraffic - (($user->u + $user->d) / 1073741824);
         $result = $trafficUnitPrice * $notUsedTraffic;
-        $orderModel = Order::where('user_id', $user->id)->where('period', '!=', 'reset_price')->where('status', 3);
+        $orderModel = Order::where('user_id', $user->id)->where('period', '!=', 'reset_price')->where('status', Order::STATUS_COMPLETED);
         $order->surplus_amount = $result > 0 ? $result : 0;
         $order->surplus_order_ids = array_column($orderModel->get()->toArray(), 'id');
     }
@@ -184,9 +184,8 @@ class OrderService
     private function getSurplusValueByPeriod(User $user, Order $order)
     {
         $orders = Order::where('user_id', $user->id)
-            ->where('period', '!=', 'reset_price')
+            ->whereNotIn('period', ['reset_price', 'onetime_price'])
-            ->where('period', '!=', 'onetime_price')
+            ->where('status', Order::STATUS_COMPLETED)
-            ->where('status', 3)
             ->get()
             ->toArray();
         if (!$orders) return;

app/Services/StatisticalService.php

@@ -7,44 +7,41 @@ use App\Models\Stat;
 use App\Models\StatServer;
 use App\Models\StatUser;
 use App\Models\User;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Redis;
 
-class StatisticalService {
+class StatisticalService
+{
     protected $userStats;
     protected $startAt;
     protected $endAt;
     protected $serverStats;
+    protected $statServerKey;
+    protected $statUserKey;
+    protected $redis;
 
     public function __construct()
     {
         ini_set('memory_limit', -1);
+        $this->redis = Redis::connection();
+
     }
 
-    public function setStartAt($timestamp) {
+    public function setStartAt($timestamp)
+    {
         $this->startAt = $timestamp;
+        $this->statServerKey = "stat_server_{$this->startAt}";
+        $this->statUserKey = "stat_user_{$this->startAt}";
     }
 
-    public function setEndAt($timestamp) {
+    public function setEndAt($timestamp)
+    {
         $this->endAt = $timestamp;
     }
 
-    public function setServerStats() {
+    /**
-        $this->serverStats = Cache::get("stat_server_{$this->startAt}");
+     * 生成统计报表
-        $this->serverStats = json_decode($this->serverStats, true) ?? [];
+     */
-        if (!is_array($this->serverStats)) {
-            $this->serverStats = [];
-        }
-    }
-
-    public function setUserStats() {
-        $this->userStats = Cache::get("stat_user_{$this->startAt}");
-        $this->userStats = json_decode($this->userStats, true) ?? [];
-        if (!is_array($this->userStats)) {
-            $this->userStats = [];
-        }
-    }
-
     public function generateStatData(): array
     {
         $startAt = $this->startAt;
@@ -80,97 +77,120 @@ class StatisticalService {
             ->whereNotNull('invite_user_id')
             ->count();
         $data['transfer_used_total'] = StatServer::where('created_at', '>=', $startAt)
-                ->where('created_at', '<', $endAt)
+            ->where('created_at', '<', $endAt)
-                ->select(DB::raw('SUM(u) + SUM(d) as total'))
+            ->select(DB::raw('SUM(u) + SUM(d) as total'))
-                ->value('total') ?? 0;
+            ->value('total') ?? 0;
         return $data;
     }
 
+    /**
+     * 往服务器报表缓存正追加流量使用数据
+     */
     public function statServer($serverId, $serverType, $u, $d)
     {
-        $this->serverStats[$serverType] = $this->serverStats[$serverType] ?? [];
+        $u_menber = "{$serverType}_{$serverId}_u"; //储存上传流量的集合成员
-        if (isset($this->serverStats[$serverType][$serverId])) {
+        $d_menber = "{$serverType}_{$serverId}_d"; //储存下载流量的集合成员
-            $this->serverStats[$serverType][$serverId][0] += $u;
+        $this->redis->zincrby($this->statServerKey, $u, $u_menber);
-            $this->serverStats[$serverType][$serverId][1] += $d;
+        $this->redis->zincrby($this->statServerKey, $d, $d_menber);
-        } else {
-            $this->serverStats[$serverType][$serverId] = [$u, $d];
-        }
-        Cache::set("stat_server_{$this->startAt}", json_encode($this->serverStats));
     }
 
+    /**
+     * 追加用户使用流量
+     */
     public function statUser($rate, $userId, $u, $d)
     {
-        $this->userStats[$rate] = $this->userStats[$rate] ?? [];
+        $u_menber = "{$rate}_{$userId}_u"; //储存上传流量的集合成员
-        if (isset($this->userStats[$rate][$userId])) {
+        $d_menber = "{$rate}_{$userId}_d"; //储存下载流量的集合成员
-            $this->userStats[$rate][$userId][0] += $u;
+        $this->redis->zincrby($this->statUserKey, $u, $u_menber);
-            $this->userStats[$rate][$userId][1] += $d;
+        $this->redis->zincrby($this->statUserKey, $d, $d_menber);
-        } else {
-            $this->userStats[$rate][$userId] = [$u, $d];
-        }
-        Cache::set("stat_user_{$this->startAt}", json_encode($this->userStats));
     }
 
+    /**
+     * 获取指定用户的流量使用情况
+     */
     public function getStatUserByUserID($userId): array
     {
+
         $stats = [];
-        foreach (array_keys($this->userStats) as $rate) {
+        $statsUser = $this->redis->zrange($this->statUserKey, 0, -1, true);
-            if (!isset($this->userStats[$rate][$userId])) continue;
+        foreach ($statsUser as $member => $value) {
-            $stats[] = [
+            list($rate, $uid, $type) = explode('_', $member);
+            if ($uid !== $userId)
+                continue;
+            $key = "{$rate}_{$uid}";
+            $stats[$key] = $stats[$key] ?? [
                 'record_at' => $this->startAt,
-                'server_rate' => $rate,
+                'server_rate' => floatval($rate),
-                'u' => $this->userStats[$rate][$userId][0],
+                'u' => 0,
-                'd' => $this->userStats[$rate][$userId][1],
+                'd' => 0,
-                'user_id' => $userId
+                'user_id' => intval($userId),
             ];
+            $stats[$key][$type] += $value;
         }
-        return $stats;
+        return array_values($stats);
     }
 
+    /**
+     * 获取缓存中的用户报表
+     */
     public function getStatUser()
     {
         $stats = [];
-        foreach ($this->userStats as $k => $v) {
+        $statsUser = $this->redis->zrange($this->statUserKey, 0, -1, true);
-            foreach (array_keys($v) as $userId) {
+        foreach ($statsUser as $member => $value) {
-                if (isset($v[$userId])) {
+            list($rate, $uid, $type) = explode('_', $member);
-                    $stats[] = [
+            $key = "{$rate}_{$uid}";
-                        'server_rate' => $k,
+            $stats[$key] = $stats[$key] ?? [
-                        'u' => $v[$userId][0],
+                'record_at' => $this->startAt,
-                        'd' => $v[$userId][1],
+                'server_rate' => $rate,
-                        'user_id' => $userId
+                'u' => 0,
-                    ];
+                'd' => 0,
-                }
+                'user_id' => intval($uid),
-            }
+            ];
+            $stats[$key][$type] += $value;
         }
-        return $stats;
+        return array_values($stats);
     }
 
 
+    /**
+     * 获取缓存中的服务器爆表
+     */
     public function getStatServer()
     {
         $stats = [];
-        foreach ($this->serverStats as $serverType => $v) {
+        $statsServer = $this->redis->zrange($this->statServerKey, 0, -1, true);
-            foreach (array_keys($v) as $serverId) {
+        foreach ($statsServer as $member => $value) {
-                if (isset($v[$serverId])) {
+            list($serverType, $serverId, $type) = explode('_', $member);
-                    $stats[] = [
+            $key = "{$serverType}_{$serverId}";
-                        'server_id' => $serverId,
+            if (!isset($stats[$key])) {
-                        'server_type' => $serverType,
+                $stats[$key] = [
-                        'u' => $v[$serverId][0],
+                    'server_id' => intval($serverId),
-                        'd' => $v[$serverId][1],
+                    'server_type' => $serverType,
-                    ];
+                    'u' => 0,
-                }
+                    'd' => 0,
+                ];
             }
+            $stats[$key][$type] += $value;
         }
-        return $stats;
+        return array_values($stats);
+
     }
 
+    /**
+     * 清除用户报表缓存数据
+     */
     public function clearStatUser()
     {
-        Cache::forget("stat_user_{$this->startAt}");
+        $this->redis->del($this->statUserKey);
     }
 
+    /**
+     * 清除服务器报表缓存数据
+     */
     public function clearStatServer()
     {
-        Cache::forget("stat_server_{$this->startAt}");
+        $this->redis->del($this->statServerKey);
     }
 
     public function getStatRecord($type)
@@ -236,7 +256,8 @@ class StatisticalService {
 
         $users = User::whereIn('id', $stats->pluck('invite_user_id')->toArray())->get()->keyBy('id');
         foreach ($stats as $k => $v) {
-            if (!isset($users[$v['invite_user_id']])) continue;
+            if (!isset($users[$v['invite_user_id']]))
+                continue;
             $stats[$k]['email'] = $users[$v['invite_user_id']]['email'];
         }
         return $stats;
@@ -258,7 +279,8 @@ class StatisticalService {
             ->get();
         $users = User::whereIn('id', $stats->pluck('user_id')->toArray())->get()->keyBy('id');
         foreach ($stats as $k => $v) {
-            if (!isset($users[$v['user_id']])) continue;
+            if (!isset($users[$v['user_id']]))
+                continue;
             $stats[$k]['email'] = $users[$v['user_id']]['email'];
         }
         return $stats;

app/Services/UserService.php

@@ -2,10 +2,11 @@
 
 namespace App\Services;
 
-use App\Jobs\TrafficFetchJob;
+use App\Jobs\BatchTrafficFetchJob;
 use App\Models\Order;
 use App\Models\Plan;
 use App\Models\User;
+use Illuminate\Support\Facades\Bus;
 
 class UserService
 {
@@ -21,10 +22,10 @@ class UserService
         $day = date('d', $expiredAt);
         $today = date('d');
         $lastDay = date('d', strtotime('last day of +0 months'));
-        if ((int)$day >= (int)$today && (int)$day >= (int)$lastDay) {
+        if ((int) $day >= (int) $today && (int) $day >= (int) $lastDay) {
             return $lastDay - $today;
         }
-        if ((int)$day >= (int)$today) {
+        if ((int) $day >= (int) $today) {
             return $day - $today;
         }
 
@@ -34,7 +35,7 @@ class UserService
     private function calcResetDayByYearFirstDay(): int
     {
         $nextYear = strtotime(date("Y-01-01", strtotime('+1 year')));
-        return (int)(($nextYear - time()) / 86400);
+        return (int) (($nextYear - time()) / 86400);
     }
 
     private function calcResetDayByYearExpiredAt(int $expiredAt): int
@@ -43,9 +44,9 @@ class UserService
         $nowYear = strtotime(date("Y-{$md}"));
         $nextYear = strtotime('+1 year', $nowYear);
         if ($nowYear > time()) {
-            return (int)(($nowYear - time()) / 86400);
+            return (int) (($nowYear - time()) / 86400);
         }
-        return (int)(($nextYear - time()) / 86400);
+        return (int) (($nextYear - time()) / 86400);
     }
 
     public function getResetDay(User $user)
@@ -53,13 +54,15 @@ class UserService
         if (!isset($user->plan)) {
             $user->plan = Plan::find($user->plan_id);
         }
-        if ($user->expired_at <= time() || $user->expired_at === NULL) return null;
+        if ($user->expired_at <= time() || $user->expired_at === NULL)
+            return null;
         // if reset method is not reset
-        if ($user->plan->reset_traffic_method === 2) return null;
+        if ($user->plan->reset_traffic_method === 2)
+            return null;
         switch (true) {
             case ($user->plan->reset_traffic_method === NULL): {
                 $resetTrafficMethod = admin_setting('reset_traffic_method', 0);
-                switch ((int)$resetTrafficMethod) {
+                switch ((int) $resetTrafficMethod) {
                     // month first day
                     case 0:
                         return $this->calcResetDayByMonthFirstDay();
@@ -123,9 +126,9 @@ class UserService
                 ->orWhere('expired_at', 0);
         })
             ->where(function ($query) {
-            $query->where('plan_id', NULL)
+                $query->where('plan_id', NULL)
-                ->orWhere('transfer_enable', 0);
+                    ->orWhere('transfer_enable', 0);
-        })
+            })
             ->get();
     }
 
@@ -139,7 +142,7 @@ class UserService
         return User::all();
     }
 
-    public function addBalance(int $userId, int $balance):bool
+    public function addBalance(int $userId, int $balance): bool
     {
         $user = User::lockForUpdate()->find($userId);
         if (!$user) {
@@ -155,7 +158,7 @@ class UserService
         return true;
     }
 
-    public function isNotCompleteOrderByUserId(int $userId):bool
+    public function isNotCompleteOrderByUserId(int $userId): bool
     {
         $order = Order::whereIn('status', [0, 1])
             ->where('user_id', $userId)
@@ -168,13 +171,24 @@ class UserService
 
     public function trafficFetch(array $server, string $protocol, array $data, string $nodeIp = null)
     {
-        // 获取子节点
+
-        $childServer = ($server['parent_id'] == null && !blank($nodeIp)) 
-        ? ServerService::getChildServer($server['id'], $protocol, $nodeIp) 
-        : null;
         $timestamp = strtotime(date('Y-m-d'));
-        collect($data)->chunk(1000)->each(function($chunk) use ($timestamp,$server,$protocol, $childServer){
+        $statService = new StatisticalService();
-            TrafficFetchJob::dispatch($server, $chunk->toArray(), $protocol, $timestamp, $childServer);
+        $statService->setStartAt($timestamp);
+        // 获取子节点
+        $childServer = ($server['parent_id'] == null && $nodeIp) ? ServerService::getChildServer($server['id'], $protocol, $nodeIp) : null;
+        foreach ($data as $uid => $v) {
+            $u = $v[0];
+            $d = $v[1];
+            $targetServer = $childServer ?? $server;
+            $statService->statUser($targetServer['rate'], $uid, $u, $d); //如果存在子节点则使用子节点的倍率
+            if (!blank($childServer)) { //如果存在子节点，则给子节点计算流量
+                $statService->statServer($childServer['id'], $protocol, $u, $d);
+            }
+            $statService->statServer($server['id'], $protocol, $u, $d);
+        }
+        collect($data)->chunk(1000)->each(function ($chunk) use ($timestamp, $server, $protocol, $childServer) {
+            BatchTrafficFetchJob::dispatch($server, $chunk->toArray(), $protocol, $timestamp, $childServer);
         });
     }
 }