This commit is contained in:
baodev0
2026-09-23 15:17:18 +07:00
parent cd38c5d6d0
commit 82a71244ca
107 changed files with 3332 additions and 3306 deletions
+18 -4
View File
@@ -2,11 +2,13 @@
namespace App\Jobs\Payment;
use App\Enums\TransactionStatus;
use App\Events\Notification_Expiry_Time;
use App\Events\Notification_Pay_Success;
use App\Http\Services\MBBank;
use App\Models\Customer;
use App\Models\Transaction;
use Illuminate\Support\Str;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
@@ -60,14 +62,26 @@ class GetTransactionPayment implements ShouldQueue
// firstOrCreate is atomic against the unique(customer_id, trans, type) index —
// a duplicate bank-statement poll (job retried, matched twice) cannot credit twice.
$amount = (int) $item['creditAmount'];
// type/status/uuid/public_code phải set đủ: unique index là
// (customer_id, trans, type) nên type NULL làm chống trùng hụt một nửa,
// và kế toán không lọc được dòng tiền vào theo loại khi lên báo cáo.
$created = Transaction::firstOrCreate(
['trans' => $transaction, 'customer_id' => $this->user],
['amount' => (int) $item['creditAmount']]
['trans' => $transaction, 'customer_id' => $this->user, 'type' => 'auto'],
[
'uuid' => (string) Str::uuid(),
'public_code' => 'DEP-AUTO-' . now()->format('Ymd') . '-' . strtoupper(Str::random(6)),
'amount' => $amount,
'received_amount' => $amount,
'status' => TransactionStatus::COMPLETED->value,
'note' => 'Tự động khớp sao kê MB Bank',
]
);
if ($created->wasRecentlyCreated) {
Customer::find($this->user)->increment('credit', (int)$item['creditAmount']);
Customer::find($this->user)->increment('total', (int)$item['creditAmount']);
Customer::find($this->user)->increment('credit', Customer::creditFor($amount));
Customer::find($this->user)->increment('total', $amount);
$message = number_format($item['creditAmount'], 0, ',', '.') . "đ vào tài khoản";
$status = 1;