fix pargar bugs

This commit is contained in:
2026-07-21 12:36:59 +03:30
parent 10a510529d
commit ebfeb24e60
4 changed files with 381 additions and 9 deletions
@@ -9,6 +9,7 @@ use App\Models\Customer;
use App\Models\Order;
use App\Models\PargarSyncLog;
use App\Services\ConfigService;
use App\Services\PargarInboundWalletService;
use App\Services\PargarSyncService;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Schema;
@@ -224,28 +225,52 @@ class PargarInboundController extends Controller
]);
}
protected function inboundWallet(): PargarInboundWalletService
{
return app(PargarInboundWalletService::class);
}
public function storeDocuments(Request $request)
{
$data = $this->pargarPayload($request);
$accountId = trim((string) ($data['accountId'] ?? ''));
$transactions = $data['transactions'] ?? [];
$customer = $accountId !== ''
? Customer::where('pargar_account_id', $accountId)->first()
: null;
if ($customer) {
$applyResult = $this->inboundWallet()->applyDocuments($customer, $data);
return response()->json([
'success' => true,
'message' => sprintf(
'اسناد مشتری دریافت شد — اعمال: %d، رد شده: %d',
$applyResult['applied'],
$applyResult['skipped']
),
'data' => $applyResult,
]);
}
// مشتری ناشناس — فقط لاگ برای بررسی ادمین
$summary = $this->sync()->summarizeInboundDocument($data);
PargarSyncLog::create([
'customer_id' => $customer?->id,
'desc' => 'دریافت اسناد از پرگار',
'customer_id' => null,
'amount' => $summary['amount'],
'desc' => 'دریافت اسناد از پرگار — مشتری یافت نشد',
'type' => PargarSyncService::TYPE_DOCUMENT,
'sync_status' => PargarSyncService::STATUS_SUCCESS,
'pargar_ref' => $accountId,
'data' => json_encode($data, JSON_UNESCAPED_UNICODE),
'pargar_ref' => $accountId !== '' ? $accountId : null,
'data' => json_encode(array_merge($data, [
'_summary' => $summary,
'wallet_applied' => false,
]), JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT),
]);
return response()->json([
'success' => true,
'message' => 'اسناد مشتری با موفقیت دریافت شد',
'message' => 'اسناد دریافت شد ولی مشتری با این کد حساب یافت نشد',
'data' => null,
]);
}
+260
View File
@@ -0,0 +1,260 @@
<?php
namespace App\Services;
use App\Models\Customer;
use App\Models\PargarSyncLog;
use Illuminate\Support\Facades\Log;
use Rooyesh\Wallet\interfaces\TransactionInterface;
use Rooyesh\Wallet\interfaces\WalletInterface;
/**
* اعمال اسناد ورودی پرگار روی کیف اپ — سندبه‌سند، نه تعدیل bulk از mande.
*/
class PargarInboundWalletService
{
public const TX_TYPE_PARGAR = 22;
public function __construct(
private readonly PargarSyncService $sync,
private readonly WalletBroadcastService $walletBroadcast
) {
}
/**
* @param array<string, mixed> $data
* @return array{applied: int, skipped: int, errors: list<string>, logs: list<int>}
*/
public function applyDocuments(Customer $customer, array $data): array
{
$transactions = is_array($data['transactions'] ?? null) ? $data['transactions'] : [];
$accountId = trim((string) ($data['accountId'] ?? ''));
$result = [
'applied' => 0,
'skipped' => 0,
'errors' => [],
'logs' => [],
];
if ($transactions === []) {
return $result;
}
$walletApplied = false;
foreach ($transactions as $tx) {
if (! is_array($tx)) {
continue;
}
$docId = trim((string) ($tx['docId'] ?? ''));
if ($docId === '') {
$result['skipped']++;
continue;
}
if ($this->isDocumentApplied($docId)) {
$result['skipped']++;
continue;
}
$goldDelta = $this->transactionGoldDelta($tx);
$rialDelta = $this->transactionRialDelta($tx);
if (abs($goldDelta) < 0.01 && abs($rialDelta) < 1) {
$result['skipped']++;
continue;
}
if ($this->isEchoOfRecentOutbound((int) $customer->id, $goldDelta, $rialDelta)) {
$this->recordSkippedDocument($customer, $docId, $accountId, $tx, 'echo_outbound');
$result['skipped']++;
continue;
}
try {
$this->applyTransactionDelta($customer, $tx, $goldDelta, $rialDelta);
$walletApplied = true;
$summary = $this->sync->summarizeInboundDocument([
'accountId' => $accountId,
'accountName' => $data['accountName'] ?? null,
'transactions' => [$tx],
]);
$log = PargarSyncLog::create([
'customer_id' => $customer->id,
'amount' => $summary['amount'],
'desc' => $summary['desc'] !== '' ? $summary['desc'] : 'اعمال سند پرگار',
'type' => PargarSyncService::TYPE_DOCUMENT,
'sync_status' => PargarSyncService::STATUS_SUCCESS,
'pargar_ref' => $docId,
'data' => json_encode([
'accountId' => $accountId,
'accountName' => $data['accountName'] ?? null,
'transaction' => $tx,
'wallet_applied' => true,
'gold_delta' => $goldDelta,
'rial_delta' => $rialDelta,
], JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT),
]);
$result['applied']++;
$result['logs'][] = (int) $log->id;
} catch (\Throwable $e) {
Log::warning('Pargar inbound document apply failed', [
'customer_id' => $customer->id,
'doc_id' => $docId,
'error' => $e->getMessage(),
]);
$result['errors'][] = "سند {$docId}: " . $e->getMessage();
}
}
if ($walletApplied) {
$this->walletBroadcast->broadcastForCustomer(
(int) $customer->id,
(int) ($customer->type ?? 2)
);
}
return $result;
}
public function isDocumentApplied(string $docId): bool
{
if ($docId === '') {
return false;
}
return PargarSyncLog::query()
->where('type', PargarSyncService::TYPE_DOCUMENT)
->where('pargar_ref', $docId)
->where('sync_status', PargarSyncService::STATUS_SUCCESS)
->exists();
}
/**
* @param array<string, mixed> $tx
*/
private function applyTransactionDelta(Customer $customer, array $tx, float $goldDelta, float $rialDelta): void
{
$ownerType = (int) ($customer->type ?? 2);
$walletInterface = new WalletInterface((int) $customer->id, $ownerType);
$desc = trim((string) ($tx['desc'] ?? ''));
$docType = trim((string) ($tx['docType'] ?? ''));
$title = $desc !== '' ? $desc : ($docType !== '' ? $docType : 'سند پرگار');
$input = [
'title' => $title,
'note' => trim((string) ($tx['docId'] ?? '')),
'expire_at' => now(),
'active' => true,
];
if (abs($goldDelta) >= 0.01) {
$input['gold'] = abs($goldDelta);
}
if (abs($rialDelta) >= 1) {
$input['cash'] = abs($rialDelta);
}
new TransactionInterface(
$walletInterface,
$input,
self::TX_TYPE_PARGAR,
$goldDelta > 0,
$rialDelta > 0
);
}
/**
* @param array<string, mixed> $tx
*/
private function transactionGoldDelta(array $tx): float
{
$bes = $this->parseNumber($tx['besGold'] ?? 0);
$bed = $this->parseNumber($tx['bedGold'] ?? 0);
return $bes - $bed;
}
/**
* @param array<string, mixed> $tx
*/
private function transactionRialDelta(array $tx): float
{
$bes = $this->parseNumber($tx['besRial'] ?? 0);
$bed = $this->parseNumber($tx['bedRial'] ?? 0);
return $bes - $bed;
}
private function isEchoOfRecentOutbound(int $customerId, float $goldDelta, float $rialDelta): bool
{
$since = now()->subDays(3);
$logs = PargarSyncLog::query()
->where('customer_id', $customerId)
->whereIn('type', [PargarSyncService::TYPE_WALLET_CASH, PargarSyncService::TYPE_WALLET_GOLD])
->where('created_at', '>=', $since)
->whereIn('sync_status', [PargarSyncService::STATUS_PENDING, PargarSyncService::STATUS_SUCCESS])
->get();
foreach ($logs as $log) {
$payload = json_decode((string) $log->data, true) ?: [];
$signed = (float) ($payload['signed_amount'] ?? 0);
$kind = (string) ($payload['kind'] ?? '');
if ($kind === 'gold' && abs($goldDelta) >= 0.01 && abs(abs($signed) - abs($goldDelta)) < 0.01) {
if (($signed > 0 && $goldDelta > 0) || ($signed < 0 && $goldDelta < 0)) {
return true;
}
}
if ($kind === 'cash' && abs($rialDelta) >= 1 && abs(abs($signed) - abs($rialDelta)) < 1) {
if (($signed > 0 && $rialDelta > 0) || ($signed < 0 && $rialDelta < 0)) {
return true;
}
}
}
return false;
}
/**
* @param array<string, mixed> $tx
*/
private function recordSkippedDocument(
Customer $customer,
string $docId,
string $accountId,
array $tx,
string $reason
): void {
PargarSyncLog::create([
'customer_id' => $customer->id,
'desc' => 'سند پرگار — قبلاً از پنل ارسال شده (بدون اعمال مجدد)',
'type' => PargarSyncService::TYPE_DOCUMENT,
'sync_status' => PargarSyncService::STATUS_SUCCESS,
'pargar_ref' => $docId,
'data' => json_encode([
'accountId' => $accountId,
'transaction' => $tx,
'wallet_applied' => false,
'skip_reason' => $reason,
], JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT),
]);
}
private function parseNumber(mixed $value): float
{
if ($value === null || $value === '') {
return 0.0;
}
return (float) str_replace('/', '.', (string) $value);
}
}
+87
View File
@@ -490,6 +490,93 @@ class PargarSyncService
return $title !== '' ? $title : 'آبشده';
}
/**
* خلاصهٔ اسناد ورودی از پرگار برای نمایش در جدول ادمین.
*
* @param array<string, mixed> $data
* @return array{
* desc: string,
* amount: float|null,
* amount_unit: 'gold'|'rial'|null,
* tx_count: int,
* account_name: string|null
* }
*/
public function summarizeInboundDocument(array $data): array
{
$accountName = trim((string) ($data['accountName'] ?? ''));
$transactions = is_array($data['transactions'] ?? null) ? $data['transactions'] : [];
$txLines = [];
$maxGold = 0.0;
$maxRial = 0.0;
$txCount = 0;
foreach ($transactions as $tx) {
if (! is_array($tx)) {
continue;
}
$txCount++;
$desc = trim((string) ($tx['desc'] ?? ''));
$docType = trim((string) ($tx['docType'] ?? ''));
$line = $desc !== '' ? $desc : ($docType !== '' ? $docType : null);
if ($line !== null) {
$txLines[] = $line;
}
$maxGold = max(
$maxGold,
abs($this->parsePargarNumber($tx['bedGold'] ?? 0)),
abs($this->parsePargarNumber($tx['besGold'] ?? 0))
);
$maxRial = max(
$maxRial,
abs($this->parsePargarNumber($tx['bedRial'] ?? 0)),
abs($this->parsePargarNumber($tx['besRial'] ?? 0))
);
}
if ($txLines !== []) {
$unique = array_values(array_unique($txLines));
$desc = implode(' | ', array_slice($unique, 0, 3));
if ($txCount > count(array_slice($unique, 0, 3))) {
$desc .= ' (+' . ($txCount - min(3, count($unique))) . ' سند دیگر)';
}
} elseif ($accountName !== '') {
$desc = "اسناد {$accountName} از پرگار";
} else {
$desc = $txCount > 0 ? "دریافت {$txCount} سند از پرگار" : 'دریافت اسناد از پرگار';
}
$amount = null;
$amountUnit = null;
if ($maxGold >= 0.01) {
$amount = $maxGold;
$amountUnit = 'gold';
} elseif ($maxRial >= 1) {
$amount = $maxRial;
$amountUnit = 'rial';
}
return [
'desc' => $desc,
'amount' => $amount,
'amount_unit' => $amountUnit,
'tx_count' => $txCount,
'account_name' => $accountName !== '' ? $accountName : null,
];
}
private function parsePargarNumber(mixed $value): float
{
if ($value === null || $value === '') {
return 0.0;
}
return (float) str_replace('/', '.', (string) $value);
}
public function resolveOrderProduct(?Order $order, ?array $payload = null): ?Product
{
$productId = (int) ($payload['product_id'] ?? $order?->product_id ?? 0);