From bf278e438ea2b6a69f248eaacf027b138fb1439e Mon Sep 17 00:00:00 2001 From: JiaSheng Date: Wed, 20 Dec 2023 17:41:10 +0800 Subject: [PATCH 1/2] update group command --- .../Commands/UpdateGroupWithTransferFee.php | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 app/Console/Commands/UpdateGroupWithTransferFee.php diff --git a/app/Console/Commands/UpdateGroupWithTransferFee.php b/app/Console/Commands/UpdateGroupWithTransferFee.php new file mode 100644 index 00000000..a30e8982 --- /dev/null +++ b/app/Console/Commands/UpdateGroupWithTransferFee.php @@ -0,0 +1,74 @@ +get(); + Log::info($groups->count()); + + // $groups = Group::where('id', 999)->get(); + + foreach ($groups as $group) { + $originalTransferFees = (float)Transaction::where('type', TransactionType::TRANSFER_FEE)->whereIn('owner_id', $group->transactions->pluck('id'))->sum('service_charge'); + $correctOriginalAmount = $group->transactions()->sum('original_amount'); + $correctOriginalAmount += $originalTransferFees; + $correctAmount = $group->transactions()->sum('amount'); + $transferFees = $originalTransferFees / $group->currency_rate; + $correctAmount += $transferFees; + + if ($group->original_amount != $correctOriginalAmount) { + // $group->original_amount = $correctOriginalAmount; + // $group->amount = $correctAmount; + // $group->save(); + Log::info("Update group id: " . $group->id . " correct original amount is: " . $correctOriginalAmount . " transfer fee is " . $originalTransferFees); + } else { + Log::info("No update for group id: " . $group->id); + } + } + } +} From 89eaa78ee98ae0ca3dec3a01e17ae8b88a6c1be8 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Wed, 20 Dec 2023 17:57:03 +0800 Subject: [PATCH 2/2] update logging --- app/Console/Commands/UpdateGroupWithTransferFee.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Console/Commands/UpdateGroupWithTransferFee.php b/app/Console/Commands/UpdateGroupWithTransferFee.php index a30e8982..be71d129 100644 --- a/app/Console/Commands/UpdateGroupWithTransferFee.php +++ b/app/Console/Commands/UpdateGroupWithTransferFee.php @@ -49,7 +49,7 @@ class UpdateGroupWithTransferFee extends Command ini_set('max_execution_time', 0); set_time_limit(0); $groups = Group::whereDate('updated_at', '<', Carbon::now())->get(); - Log::info($groups->count()); + $this->info($groups->count()); // $groups = Group::where('id', 999)->get(); @@ -65,10 +65,11 @@ class UpdateGroupWithTransferFee extends Command // $group->original_amount = $correctOriginalAmount; // $group->amount = $correctAmount; // $group->save(); - Log::info("Update group id: " . $group->id . " correct original amount is: " . $correctOriginalAmount . " transfer fee is " . $originalTransferFees); + $this->info("Update group id: " . $group->id . " correct original amount is: " . $correctOriginalAmount . " transfer fee is " . $originalTransferFees); } else { - Log::info("No update for group id: " . $group->id); + $this->info("No update for group id: " . $group->id); } } + $this->info(Carbon::now() . ' : ' . 'updateGroupWithTransferFee ------ completed'); } }