lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-24 03:57:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve claim settle

Browse Source
This commit is contained in:
xiaomlove
2022-05-06 15:50:26 +08:00
parent c23cc1b441
commit f64834b594
18 changed files with 124 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/ClaimSettle.php
-1
View File
@@ -3,7 +3,6 @@
namespace App\Console\Commands;
use App\Repositories\ClaimRepository;
use App\Repositories\ExamRepository;
use Illuminate\Console\Command;
class ClaimSettle extends Command
app/Console/Commands/Test.php
+1 -1
View File
@@ -127,7 +127,7 @@ class Test extends Command
// $r = $rep->getContinuousPoints(11);
$arr = [1,2];
$r = collect($arr)->map(fn($item) => $item * 2)->implode(',');
$r = Carbon::now()->format('d');
dd($r, $arr);
}
app/Console/Kernel.php
+9 -7
View File
@@ -2,6 +2,7 @@
namespace App\Console;
use Carbon\Carbon;
use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
@@ -24,14 +25,15 @@ class Kernel extends ConsoleKernel
*/
protected function schedule(Schedule $schedule)
{
$schedule->command('exam:assign_cronjob')->everyMinute();
$schedule->command('exam:checkout_cronjob')->everyMinute();
$schedule->command('exam:update_progress --bulk=1')->hourly();
$schedule->command('backup:cronjob')->everyMinute();
$schedule->command('hr:update_status')->everyMinute();
$schedule->command('hr:update_status --ignore_time=1')->hourly();
$schedule->command('exam:assign_cronjob')->everyMinute()->withoutOverlapping();
$schedule->command('exam:checkout_cronjob')->everyMinute()->withoutOverlapping();
$schedule->command('exam:update_progress --bulk=1')->hourly()->withoutOverlapping();
$schedule->command('backup:cronjob')->everyMinute()->withoutOverlapping();
$schedule->command('hr:update_status')->everyMinute()->withoutOverlapping();
$schedule->command('hr:update_status --ignore_time=1')->hourly()->withoutOverlapping();
$schedule->command('user:delete_expired_token')->dailyAt('04:00');
$schedule->command('claim:settle')->monthlyOn();
$schedule->command('claim:settle')->hourly()->between("00:00", "12:00")
->when(function () {Carbon::now()->format('d') == '01';})->withoutOverlapping();
}
/**
app/Models/Claim.php
+5
View File
@@ -37,6 +37,11 @@ class Claim extends NexusModel
return $this->belongsTo(Snatch::class, 'snatched_id');
}
public static function getConfigIsEnabled(): bool
{
return Setting::get('torrent.claim_enabled', 'no') == 'yes';
}
public static function getConfigTorrentTTL()
{
return Setting::get('torrent.claim_torrent_ttl', self::TORRENT_TTL);
app/Repositories/ClaimRepository.php
+83 -48
View File
@@ -1,16 +1,13 @@
<?php
namespace App\Repositories;
use App\Models\BonusLogs;
use App\Models\Claim;
use App\Models\Message;
use App\Models\Setting;
use App\Models\Snatch;
use App\Models\Torrent;
use App\Models\User;
use Carbon\Carbon;
use Illuminate\Support\Facades\DB;
use JetBrains\PhpStorm\ArrayShape;
use Nexus\Database\NexusDB;
class ClaimRepository extends BaseRepository
@@ -27,6 +24,10 @@ class ClaimRepository extends BaseRepository
public function store($uid, $torrentId)
{
$isEnabled = Claim::getConfigIsEnabled();
if ($isEnabled) {
throw new \RuntimeException(nexus_trans("torrent.claim_disabled"));
}
$exists = Claim::query()->where('uid', $uid)->where('torrent_id', $torrentId)->exists();
if ($exists) {
throw new \RuntimeException(nexus_trans("torrent.claim_already"));
@@ -34,7 +35,12 @@ class ClaimRepository extends BaseRepository
$max = Claim::getConfigTorrentUpLimit();
$count = Claim::query()->where('uid', $uid)->count();
if ($count >= $max) {
throw new \RuntimeException(nexus_trans("torrent.claim_number_reach_maximum"));
throw new \RuntimeException(nexus_trans("torrent.claim_number_reach_torrent_maximum"));
}
$max = Claim::getConfigUserUpLimit();
$count = Claim::query()->where('torrent_id', $torrentId)->count();
if ($count >= $max) {
throw new \RuntimeException(nexus_trans("torrent.claim_number_reach_user_maximum"));
}
$snatch = Snatch::query()->where('userid', $uid)->where('torrentid', $torrentId)->first();
if (!$snatch) {
@@ -70,6 +76,10 @@ class ClaimRepository extends BaseRepository
public function delete($id, $uid)
{
$isEnabled = Claim::getConfigIsEnabled();
if ($isEnabled) {
throw new \RuntimeException(nexus_trans("torrent.claim_disabled"));
}
$model = Claim::query()->findOrFail($id);
if ($model->uid != $uid) {
throw new \RuntimeException("No permission");
@@ -93,29 +103,38 @@ class ClaimRepository extends BaseRepository
public function settleCronjob(): array
{
$query = Claim::query()->select(['uid'])->groupBy('uid');
$startOfThisMonth = Carbon::now()->startOfMonth();
$query = Claim::query()
->select(['uid'])
->where('last_settle_at', '<', $startOfThisMonth)
->groupBy('uid')
;
$size = 10000;
$page = 1;
$successCount = $failCount = 0;
while (true) {
$logPrefix = "page: $page, size: $size";
$result = (clone $query)->forPage($page, $size)->get();
$logPrefix = "size: $size";
$result = (clone $query)->take($size)->get();
if ($result->isEmpty()) {
do_log("$logPrefix, no more data...");
break;
}
do_log("get counts: " . $result->count());
foreach ($result as $row) {
$uid = $row->uid;
do_log("$logPrefix, begin to settle user: $uid...");
$result = $this->settleUser($row->uid);
do_log("$logPrefix, settle user: $uid done!, result: " . var_export($result, true));
if ($result) {
$successCount++;
} else {
try {
$result = $this->settleUser($uid);
do_log("$logPrefix, settle user: $uid done!, result: " . var_export($result, true));
if ($result) {
$successCount++;
} else {
$failCount++;
}
} catch (\Throwable $exception) {
do_log("$logPrefix, settle user: $uid fail!, error: " . $exception->getMessage() . $exception->getTraceAsString(), 'error');
$failCount++;
}
}
$page++;
}
return ['success_count' => $successCount, 'fail_count' => $failCount];
}
@@ -185,6 +204,12 @@ class ClaimRepository extends BaseRepository
$totalDeduct = $bonusDeduct * count($unReachedIdArr);
do_log("totalDeduct: $totalDeduct", 'alert');
$message = $this->buildMessage(
$user, $reachedTorrentIdArr, $unReachedTorrentIdArr, $remainTorrentIdArr,
$bonusResult, $bonusFinal, $seedTimeHoursAvg, $bonusDeduct, $totalDeduct
);
do_log("message: " . nexus_json_encode($message), 'alert');
/**
* Just do a test, debug from log
*/
@@ -193,35 +218,50 @@ class ClaimRepository extends BaseRepository
return true;
}
//Increase user bonus
User::query()->where('id', $uid)->increment('seedbonus', $bonusFinal);
do_log("Increase user bonus: $bonusFinal", 'alert');
//Wrap with transaction
DB::transaction(function () use ($uid, $unReachedIdArr, $toUpdateIdArr, $bonusFinal, $totalDeduct, $uploadedCaseWhen, $seedTimeCaseWhen, $message, $now) {
//Increase user bonus
User::query()->where('id', $uid)->increment('seedbonus', $bonusFinal);
do_log("Increase user bonus: $bonusFinal", 'alert');
//Handle unreached
if (!empty($unReachedIdArr)) {
Claim::query()->whereIn('id', $unReachedIdArr)->delete();
User::query()->where('id', $uid)->decrement('seedbonus', $totalDeduct);
do_log("Deduct user bonus: $totalDeduct", 'alert');
}
//Handle unreached
if (!empty($unReachedIdArr)) {
Claim::query()->whereIn('id', $unReachedIdArr)->delete();
User::query()->where('id', $uid)->decrement('seedbonus', $totalDeduct);
do_log("Deduct user bonus: $totalDeduct", 'alert');
}
//Update claim `last_settle_at` and init `seed_time_begin` & `uploaded_begin`
$sql = sprintf(
"update claims set uploaded_begin = case id %s end, seed_time_begin = case id %s end, last_settle_at = '%s', updated_at = '%s' where id in (%s)",
implode(' ', $uploadedCaseWhen), implode(' ', $seedTimeCaseWhen), $now->toDateTimeString(), $now->toDateTimeString(), implode(',', $toUpdateIdArr)
);
$affectedRows = DB::update($sql);
do_log("query: $sql, affectedRows: $affectedRows");
//Update claim `last_settle_at` and init `seed_time_begin` & `uploaded_begin`
$sql = sprintf(
"update claims set uploaded_begin = case id %s end, seed_time_begin = case id %s end, last_settle_at = '%s', updated_at = '%s' where id in (%s)",
implode(' ', $uploadedCaseWhen), implode(' ', $seedTimeCaseWhen), $now->toDateTimeString(), $now->toDateTimeString(), implode(',', $toUpdateIdArr)
);
$affectedRows = DB::update($sql);
do_log("query: $sql, affectedRows: $affectedRows");
//Send message
//Send message
Message::query()->insert($message);
});
do_log("[DONE], cost time: " . (time() - $now->timestamp) . " seconds");
return true;
}
private function buildMessage(
User $user, $reachedTorrentIdArr, $unReachedTorrentIdArr, $remainTorrentIdArr,
$bonusResult, $bonusFinal, $seedTimeHoursAvg, $deductPerTorrent, $deductTotal
) {
$now = Carbon::now();
$allTorrentIdArr = array_merge($reachedTorrentIdArr, $unReachedTorrentIdArr, $remainTorrentIdArr);
$torrentInfo = Torrent::query()
->whereIn('id', array_merge($reachedTorrentIdArr, $unReachedTorrentIdArr, $remainTorrentIdArr))
->whereIn('id', $allTorrentIdArr)
->get(Torrent::$commentFields)
->keyBy('id')
;
$msg = [];
$locale = $user->locale;
do_log("build message, user: {$user->id}, locale: $locale");
$msg[] = nexus_trans('claim.msg_title', ['month' => $now->clone()->subMonths(1)->format('Y-m')], $locale);
$msg[] = nexus_trans('claim.claim_total', [ 'total' => $list->count()], $locale);
$msg[] = nexus_trans('claim.claim_total', [ 'total' => count($allTorrentIdArr)], $locale);
$reachList = collect($reachedTorrentIdArr)->map(
fn($item) => sprintf("[url=details.php?id=%s]%s[/url]", $item, $torrentInfo->get($item)->name)
@@ -229,10 +269,10 @@ class ClaimRepository extends BaseRepository
$msg[] = nexus_trans("claim.claim_reached_counts", ['counts' => count($reachedTorrentIdArr)], $locale) . "\n$reachList";
$msg[] = nexus_trans(
"claim.claim_reached_summary", [
'bonus_per_hour' => number_format($bonusResult['seed_bonus'], 2),
'hours'=> number_format($seedTimeHoursAvg, 2),
'bonus_total'=> number_format($bonusFinal, 2)
], $locale
'bonus_per_hour' => number_format($bonusResult['seed_bonus'], 2),
'hours'=> number_format($seedTimeHoursAvg, 2),
'bonus_total'=> number_format($bonusFinal, 2)
], $locale
);
$remainList = collect($remainTorrentIdArr)->map(
@@ -244,24 +284,19 @@ class ClaimRepository extends BaseRepository
fn($item) => sprintf("[url=details.php?id=%s]%s[/url]", $item, $torrentInfo->get($item)->name)
)->implode("\n");
$msg[] = nexus_trans("claim.claim_unreached_remove_counts", ['counts' => count($unReachedTorrentIdArr)], $locale) . "\n$unReachList";
if ($totalDeduct) {
if ($deductTotal) {
$msg[] = nexus_trans(
"claim.claim_unreached_summary", [
'deduct_per_torrent '=> number_format($bonusDeduct, 2),
'deduct_total' => number_format($totalDeduct, 2)
], $locale
'deduct_per_torrent '=> number_format($deductPerTorrent, 2),
'deduct_total' => number_format($deductTotal, 2)
], $locale
);
}
$message = [
'receiver' => $uid,
return [
'receiver' => $user->id,
'added' => $now,
'subject' => nexus_trans('claim.msg_subject', ['month' => $now->clone()->subMonths(1)->format('Y-m')], $locale),
'msg' => implode("\n\n", $msg),
];
Message::query()->insert($message);
do_log("[DONE], cost time: " . (time() - $now->timestamp) . " seconds");
return true;
}
}