From 870bca5e578a5d697491cd8b3f425c71962b6099 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Tue, 23 Sep 2025 18:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E8=AF=A6=E6=83=85-=E5=A4=87?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/controller/FinPaymentApplyController.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/common/controller/FinPaymentApplyController.php b/app/common/controller/FinPaymentApplyController.php
index 76e51bf..3d82e92 100644
--- a/app/common/controller/FinPaymentApplyController.php
+++ b/app/common/controller/FinPaymentApplyController.php
@@ -4,6 +4,7 @@ namespace app\common\controller;
 
 use app\common\controller\BaseController;
 use app\common\model\Country;
+use app\common\model\FinPaymentStock;
 use app\common\model\SysAccount;
 use app\common\model\SysCurrency;
 use app\common\model\SysDictItem;
@@ -39,7 +40,7 @@ class FinPaymentApplyController extends BaseController
         if (isset($data['account_id'])) //收款账号
             $data['account_name'] = SysAccount::where('id', $data['account_id'])->first()->account_name;
         if (isset($data['country_id'])) //付款来源国家
-            $data['country_name'] = Country::where('id', $data['currency_id'])->first()->cn_addr;
+            $data['country_name'] = Country::where('id', $data['country_id'])->first()->cn_addr;
         if (isset($data['currency_id'])) //付款币种
             $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->first()->currency_name;
         if (isset($data['submit_files']))
@@ -68,7 +69,7 @@ class FinPaymentApplyController extends BaseController
         if (isset($data['account_id'])) //收款账号
             $data['account_name'] = SysAccount::where('id', $data['account_id'])->first()->account_name;
         if (isset($data['country_id'])) //付款来源国家
-            $data['country_name'] = Country::where('id', $data['currency_id'])->first()->cn_addr;
+            $data['country_name'] = Country::where('id', $data['country_id'])->first()->cn_addr;
         if (isset($data['currency_id'])) //付款币种
             $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->first()->currency_name;
         if (isset($data['submit_files']))
@@ -77,6 +78,14 @@ class FinPaymentApplyController extends BaseController
             $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
         if (isset($data['updated_at']))
             $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+
+        $finPaymentStock = FinPaymentStock::where('payment_apply_id', $data['id'])->get();
+        $stock = [];
+        foreach ($finPaymentStock as $v) {
+            $stock[$v['pi_no']] = ['pi_no' => $v['pi_no']];
+            $stock[$v['pi_no']]['stock_id'] = [$v['stock_id']];
+        }
+        $data['stock'] = $stock;
         return $data;
     }
 }
\ No newline at end of file