yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-06-16 06:37:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: fix coupon & server record rate issue

Browse Source
This commit is contained in:
tokumeikoi
2022-07-17 00:59:35 +08:00
parent 2073727a0a
commit 8702a3489b
8 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Jobs/StatUserJob.php
View File

@ -28,7 +28,7 @@ class StatUserJob implements ShouldQueue
*
* @return void
*/
public function __construct($u, $d, $userId, $server, $protocol, $recordType = 'd')
public function __construct($u, $d, $userId, array $server, $protocol, $recordType = 'd')
{
$this->onQueue('stat');
$this->u = $u;
@ -52,14 +52,14 @@ class StatUserJob implements ShouldQueue
}
$data = StatUser::where('record_at', $recordAt)
->where('server_rate', $this->server->rate)
->where('server_rate', $this->server['rate'])
->where('user_id', $this->userId)
->first();
if ($data) {
try {
$data->update([
'u' => $data['u'] + $this->u,
'd' => $data['d'] + $this->d
'u' => $data['u'] + ($this->u * $this->server['rate']),
'd' => $data['d'] + ($this->d * $this->server['rate'])
]);
} catch (\Exception $e) {
abort(500, '用户统计数据更新失败');
@ -67,7 +67,7 @@ class StatUserJob implements ShouldQueue
} else {
if (!StatUser::create([
'user_id' => $this->userId,
'server_rate' => $this->server->rate,
'server_rate' => $this->server['rate'],
'u' => $this->u,
'd' => $this->d,
'record_type' => $this->recordType,

8
app/Jobs/TrafficFetchJob.php
View File

@ -27,7 +27,7 @@ class TrafficFetchJob implements ShouldQueue
*
* @return void
*/
public function __construct($u, $d, $userId, $server, $protocol)
public function __construct($u, $d, $userId, array $server, $protocol)
{
$this->onQueue('traffic_fetch');
$this->u = $u;
@ -46,10 +46,10 @@ class TrafficFetchJob implements ShouldQueue
{
$user = User::lockForUpdate()->find($this->userId);
if (!$user) return;
$user->t = time();
$user->u = $user->u + $this->u;
$user->d = $user->d + $this->d;
$user->u = $user->u + ($this->u * $this->server['rate']);
$user->d = $user->d + ($this->d * $this->server['rate']);
if (!$user->save()) throw new \Exception('流量更新失败');
$mailService = new MailService();
$mailService->remindTraffic($user);