xiaokang/lotteryLaravel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add idempotency support for settlement adjustments and payments, fix rebate handling
Some checks failed
lotterLaravel CI / test (push) Has been cancelled
Details
lotterLaravel E2E / e2e-api (push) Has been cancelled
Details

Browse Source 
- Added idempotency_key parameter to settlement bill adjustment and payment endpoints to prevent duplicate operations
- Fixed player rebate profile updates to preserve existing values when only one field is modified
- Moved wallet player validation earlier in AdminPlayerStoreController to prevent unnecessary processing
- Enhanced extra rebate calculation to include 'in_bill' and 'settled' statuses in AgentP
This commit is contained in:
kang
2026-06-23 16:49:57 +08:00
parent 9a7522e928
commit 3c57941895
20 changed files with 734 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Api/V1/Admin/AgentSettlement/AgentSettlementBillAdjustmentController.php
View File

@@ -33,6 +33,7 @@ final class AgentSettlementBillAdjustmentController extends Controller
(string) ($request->validated('adjustment_type') ?? 'adjustment'),
$request->validated('reason'),
(int) $admin->id,
$request->validated('idempotency_key'),
);
$after = DB::table('settlement_bills')->where('id', $newBillId)->first();

1
app/Http/Controllers/Api/V1/Admin/AgentSettlement/AgentSettlementBillPaymentController.php
View File

@@ -35,6 +35,7 @@ final class AgentSettlementBillPaymentController extends Controller
'method' => $validated['method'] ?? null,
'proof' => $validated['proof'] ?? null,
'remark' => $validated['remark'] ?? null,
'idempotency_key' => $validated['idempotency_key'] ?? null,
],
);

15
app/Http/Controllers/Api/V1/Admin/Player/AdminPlayerStoreController.php
View File

@@ -106,6 +106,13 @@ final class AdminPlayerStoreController extends Controller
}
$agent = AgentNode::query()->findOrFail($agentNodeId);
if (! $isNative && ($request->has('credit_limit') || $request->has('rebate_rate') || $request->has('extra_rebate_rate'))) {
throw ValidationException::withMessages([
'credit_limit' => ['wallet_player_prohibited'],
]);
}
$rebateRate = 0.0;
$extraRebateRate = 0.0;
if ($request->has('rebate_rate') || $request->has('extra_rebate_rate')) {
@@ -118,12 +125,6 @@ final class AdminPlayerStoreController extends Controller
);
}
if (! $isNative && ($request->has('credit_limit') || $request->has('rebate_rate') || $request->has('extra_rebate_rate'))) {
throw ValidationException::withMessages([
'credit_limit' => ['wallet_player_prohibited'],
]);
}
$creditLimit = $request->has('credit_limit')
? (int) $request->input('credit_limit', 0)
: ($isNative ? 0 : 0);
@@ -164,7 +165,7 @@ final class AdminPlayerStoreController extends Controller
$agentProfileService->refreshAllocatedCredit($agent);
if ($request->has('rebate_rate')) {
if ($request->has('rebate_rate') || $request->has('extra_rebate_rate')) {
DB::table('player_rebate_profiles')->insert([
'player_id' => $player->id,
'game_type' => '*',

24
app/Http/Controllers/Api/V1/Admin/Player/AdminPlayerUpdateController.php
View File

@@ -55,11 +55,21 @@ final class AdminPlayerUpdateController extends Controller
]);
}
$rebateRate = 0.0;
$extraRebateRate = 0.0;
$rebateRate = null;
$extraRebateRate = null;
if ($agent !== null && ($request->has('rebate_rate') || $request->has('extra_rebate_rate'))) {
$rebateRate = (float) $request->input('rebate_rate', 0) / 100;
$extraRebateRate = (float) $request->input('extra_rebate_rate', 0) / 100;
$existing = DB::table('player_rebate_profiles')
->where('player_id', $player->id)
->where('game_type', '*')
->first();
$rebateRate = $request->has('rebate_rate')
? (float) $request->input('rebate_rate', 0) / 100
: (float) ($existing->rebate_rate ?? 0);
$extraRebateRate = $request->has('extra_rebate_rate')
? (float) $request->input('extra_rebate_rate', 0) / 100
: (float) ($existing->extra_rebate_rate ?? 0);
$rebateLimitValidator->assertPlayerRebateWithinAgent(
$agent,
$rebateRate,
@@ -78,13 +88,13 @@ final class AdminPlayerUpdateController extends Controller
unset($data['credit_limit']);
}
if ($request->has('rebate_rate') || $request->has('extra_rebate_rate')) {
if ($rebateRate !== null || $extraRebateRate !== null) {
DB::table('player_rebate_profiles')->updateOrInsert(
['player_id' => $player->id, 'game_type' => '*'],
[
'inherit_from_agent' => false,
'rebate_rate' => $rebateRate,
'extra_rebate_rate' => $extraRebateRate,
'rebate_rate' => $rebateRate ?? 0,
'extra_rebate_rate' => $extraRebateRate ?? 0,
'updated_at' => now(),
'created_at' => now(),
],