feat: [finance] 카드거래 표시 포맷 3개 화면 통일

app/Http/Controllers/Finance/AccountLedgerController.php

@@ -6,6 +6,7 @@
 use App\Models\Barobill\AccountCode;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
 class AccountLedgerController extends Controller
@@ -68,12 +69,16 @@ public function list(Request $request): JsonResponse
                 'tp.biz_no',
                 'jel.debit_amount',
                 'jel.credit_amount',
-                DB::raw("'journal' as source_type"),
+                DB::raw("COALESCE(je.source_type, 'journal') as source_type"),
                 'jel.journal_entry_id as source_id',
+                'je.source_key',
             ])
             ->orderBy('je.entry_date')
             ->get();
 
+        // 카드거래 상세 조회
+        $cardTxMap = $this->fetchCardTransactions($tenantId, $allLines);
+
         // 이월잔액 (일반전표만)
         $carryForward = $this->calculateCarryForward($tenantId, $accountCode, $startDate, $account->category);
 
@@ -100,16 +105,22 @@ public function list(Request $request): JsonResponse
 
             $runningBalance += $isDebitNormal ? ($debit - $credit) : ($credit - $debit);
 
+            $cardTx = null;
+            if ($line->source_type === 'ecard_transaction' && $line->source_key) {
+                $cardTx = $cardTxMap[$line->source_key] ?? null;
+            }
+
             $monthlyData[$month]['items'][] = [
                 'date' => $line->date,
                 'description' => $line->description,
-                'trading_partner_name' => $line->trading_partner_name,
-                'biz_no' => $line->biz_no,
+                'trading_partner_name' => $cardTx ? ($cardTx['merchant_name'] ?: $line->trading_partner_name) : $line->trading_partner_name,
+                'biz_no' => $cardTx ? ($cardTx['merchant_biz_num'] ?: $line->biz_no) : $line->biz_no,
                 'debit_amount' => $debit,
                 'credit_amount' => $credit,
                 'balance' => $runningBalance,
                 'source_type' => $line->source_type,
                 'source_id' => (int) $line->source_id,
+                'card_tx' => $cardTx,
             ];
 
             $monthlyData[$month]['subtotal']['debit'] += $debit;
@@ -141,6 +152,82 @@ public function list(Request $request): JsonResponse
         ]);
     }
 
+    /**
+     * 카드거래 상세 일괄 조회 (source_key 기반)
+     */
+    private function fetchCardTransactions(int $tenantId, Collection $lines): array
+    {
+        $sourceKeys = $lines
+            ->filter(fn ($l) => $l->source_type === 'ecard_transaction' && $l->source_key)
+            ->pluck('source_key')
+            ->unique()
+            ->values()
+            ->all();
+
+        if (empty($sourceKeys)) {
+            return [];
+        }
+
+        // source_key = "card_num|use_dt|approval_num|approval_amount"
+        $conditions = [];
+        foreach ($sourceKeys as $key) {
+            $parts = explode('|', $key);
+            if (count($parts) === 4) {
+                $conditions[] = $parts;
+            }
+        }
+
+        if (empty($conditions)) {
+            return [];
+        }
+
+        $query = DB::table('barobill_card_transactions')
+            ->where('tenant_id', $tenantId);
+
+        $query->where(function ($q) use ($conditions) {
+            foreach ($conditions as $c) {
+                $q->orWhere(function ($sub) use ($c) {
+                    $sub->where('card_num', $c[0])
+                        ->where('use_dt', $c[1])
+                        ->where('approval_num', $c[2])
+                        ->whereRaw('CAST(approval_amount AS SIGNED) = ?', [(int) $c[3]]);
+                });
+            }
+        });
+
+        $txs = $query->get();
+
+        $map = [];
+        foreach ($txs as $tx) {
+            $uniqueKey = implode('|', [
+                $tx->card_num,
+                $tx->use_dt,
+                $tx->approval_num,
+                (int) $tx->approval_amount,
+            ]);
+
+            $supplyAmount = $tx->modified_supply_amount !== null
+                ? (int) $tx->modified_supply_amount
+                : (int) $tx->approval_amount - (int) $tx->tax;
+            $taxAmount = $tx->modified_tax !== null
+                ? (int) $tx->modified_tax
+                : (int) $tx->tax;
+
+            $map[$uniqueKey] = [
+                'card_num' => $tx->card_num,
+                'card_company_name' => $tx->card_company_name,
+                'merchant_name' => $tx->merchant_name,
+                'merchant_biz_num' => $tx->merchant_biz_num,
+                'deduction_type' => $tx->deduction_type,
+                'supply_amount' => $supplyAmount,
+                'tax_amount' => $taxAmount,
+                'approval_amount' => (int) $tx->approval_amount,
+            ];
+        }
+
+        return $map;
+    }
+
     /**
      * 이월잔액 계산 (일반전표만)
      */