diff --git a/app/common/controller/FinPaymentApplyController.php b/app/common/controller/FinPaymentApplyController.php
new file mode 100644
index 0000000..57c4b75
--- /dev/null
+++ b/app/common/controller/FinPaymentApplyController.php
@@ -0,0 +1,124 @@
+<?php
+
+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;
+use app\common\model\User;
+use app\common\service\OssService;
+use app\common\traits\crud\CrudControllerTrait;
+use app\common\service\FinPaymentApplyService;
+
+class FinPaymentApplyController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new FinPaymentApplyService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function indexFormat($data)
+    {
+        if (isset($data['doc_user_id'])) //内勤
+            $data['doc_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??'';
+        if (isset($data['sales_user_id'])) //业务员
+            $data['sales_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??'';
+        if (isset($data['corp_id'])) //公司(渠道)
+            $data['corp_name'] = SysDictItem::where('id', $data['corp_id'])->value('item_label')??'';
+        if (isset($data['account_id'])){ //收款账号
+            $data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
+            $data['account_short_desc'] = SysAccount::where('id', $data['account_id'])->value('short_desc')??'';
+        }
+        if (isset($data['country_id'])) //付款来源国家
+            $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
+        if (isset($data['currency_id'])) //付款币种
+            $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
+        $OssService = new OssService();
+        if (isset($data['submit_files'])){
+            $data['submit_files'] = json_decode($data['submit_files'], true);
+            foreach ($data['submit_files'] as $key => $value) {
+                $data['submit_files'][$key] = [
+                    'file_src' => $value['file_src'],
+                    'file_full' => $OssService->generatePrivateUrl($value['file_src']),
+                    'file_name' => $value['file_name'],
+                ];
+            }
+        }
+        if (!empty($data['voucher_file'])) {
+            $data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']);
+        } elseif (isset($data['voucher_file'])) {
+            $data['voucher_file_full'] = '';
+        }
+        if (isset($data['created_at']))
+            $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']);
+        return $data;
+    }
+
+    /**
+     * 数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    public function showFormat($data)
+    {
+        if (isset($data['doc_user_id'])) //内勤
+            $data['doc_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??'';
+        if (isset($data['sales_user_id'])) //业务员
+            $data['sales_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??'';
+        if (isset($data['corp_id'])) //公司(渠道)
+            $data['corp_name'] = SysDictItem::where('id', $data['corp_id'])->value('item_label')??'';
+        if (isset($data['account_id'])){ //收款账号
+            $data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
+            $data['account_short_desc'] = SysAccount::where('id', $data['account_id'])->value('short_desc')??'';
+        }
+        if (isset($data['country_id'])) //付款来源国家
+            $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
+        if (isset($data['currency_id'])) //付款币种
+            $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
+        $OssService = new OssService();
+        if (isset($data['submit_files'])){
+            $data['submit_files'] = json_decode($data['submit_files'], true);
+            foreach ($data['submit_files'] as $key => $value) {
+                $data['submit_files'][$key] = [
+                    'file_src' => $value['file_src'],
+                    'file_full' => $OssService->generatePrivateUrl($value['file_src']),
+                    'file_name' => $value['file_name'],
+                ];
+            }
+        }
+        if (!empty($data['voucher_file'])) {
+            $data['voucher_file_full'] = $OssService->generatePrivateUrl($data['voucher_file']);
+        } elseif (isset($data['voucher_file'])) {
+            $data['voucher_file_full'] = '';
+        }
+        if (isset($data['created_at']))
+            $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'] = array_values($stock);
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/app/common/controller/FinReceiptController.php b/app/common/controller/FinReceiptController.php
new file mode 100644
index 0000000..56d7bfb
--- /dev/null
+++ b/app/common/controller/FinReceiptController.php
@@ -0,0 +1,113 @@
+<?php
+namespace app\common\controller;
+
+use app\common\controller\BaseController;
+use app\common\model\Country;
+use app\common\model\FinPaymentApply;
+use app\common\model\FinPaymentStock;
+use app\common\model\SysAccount;
+use app\common\model\SysCurrency;
+use app\common\model\SysDictItem;
+use app\common\model\User;
+use app\common\service\OssService;
+use app\common\traits\crud\CrudControllerTrait;
+use app\common\service\FinReceiptService;
+use support\Request;
+
+class FinReceiptController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new FinReceiptService();
+    }
+    public function show(Request $request)
+    {
+        try {
+            $raw = $this->service->serviceShow($request);
+            $data = $this->transformData($raw, method_exists($this, 'showFormat')
+                ? [$this, 'showFormat']
+                : null);
+            return $this->success($data);
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+    /**
+     * 列表页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+     protected function indexFormat($data)
+     {
+         if (isset($data['created_at']))
+             $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']);
+         if (isset($data['arrived_at']))
+             $data['arrived_at'] = date('Y-m-d H:i:s', $data['arrived_at']);
+         if (isset($data['received_at']))
+             $data['received_at'] = date('Y-m-d H:i:s', $data['received_at']);
+         if (isset($data['account_id'])) { //收款账号
+             $data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
+             $data['account_short_desc'] = SysAccount::where('id', $data['account_id'])->value('short_desc')??'';
+         }
+         if (isset($data['country_id'])) //付款来源国家
+             $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
+         if (isset($data['currency_id'])) //付款币种
+             $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
+         if (!empty($data['fx_receipt_file'])){
+             $data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
+         }elseif (isset($data['fx_receipt_file'])){
+             $data['fx_receipt_file_full'] = '';
+         }
+         return $data;
+     }
+
+    /**
+     * 数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function showFormat($data)
+    {
+        if (isset($data['created_at']))
+            $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']);
+        if (isset($data['arrived_at']))
+            $data['arrived_at'] = date('Y-m-d H:i:s', $data['arrived_at']);
+        if (isset($data['received_at']))
+            $data['received_at'] = date('Y-m-d H:i:s', $data['received_at']);
+        if (isset($data['account_id'])) { //收款账号
+            $data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
+            $data['account_short_desc'] = SysAccount::where('id', $data['account_id'])->value('short_desc')??'';
+        }
+        if (isset($data['country_id'])) //付款来源国家
+            $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
+        if (isset($data['currency_id'])) //付款币种
+            $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
+        if (!empty($data['fx_receipt_file'])) {
+            $data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
+        } elseif (isset($data['fx_receipt_file'])) {
+            $data['fx_receipt_file_full'] = '';
+        }
+
+        if (!empty($data['payment_apply_id'])) {
+            $paymentApply = FinPaymentApply::where('id', $data['payment_apply_id'])->first();
+            if(!$paymentApply)
+                return $data;
+            $paymentApply = $paymentApply->toArray();
+            $paymentApply['created_at'] = strtotime($paymentApply['created_at']);
+            $paymentApply['updated_at'] = strtotime($paymentApply['updated_at']);
+            $paymentApply = (new FinPaymentApplyController())->showFormat($paymentApply);
+            $data['payment_apply'] = $paymentApply;
+        }
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/app/common/controller/FinReceiptHisController.php b/app/common/controller/FinReceiptHisController.php
new file mode 100644
index 0000000..7adcf0d
--- /dev/null
+++ b/app/common/controller/FinReceiptHisController.php
@@ -0,0 +1,98 @@
+<?php
+namespace app\common\controller;
+
+use app\common\controller\BaseController;
+use app\common\model\Country;
+use app\common\model\SysAccount;
+use app\common\model\SysCurrency;
+use app\common\model\User;
+use app\common\service\OssService;
+use app\common\traits\crud\CrudControllerTrait;
+use app\common\service\FinReceiptHisService;
+use support\Request;
+
+class FinReceiptHisController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new FinReceiptHisService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function indexFormat($data)
+    {
+        if (isset($data['created_at']))
+            $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']);
+        if (isset($data['arrived_at']))
+            $data['arrived_at'] = date('Y-m-d H:i:s', $data['arrived_at']);
+        if (isset($data['received_at']))
+            $data['received_at'] = date('Y-m-d H:i:s', $data['received_at']);
+        if (isset($data['account_id'])) { //收款账号
+            $data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
+            $data['account_short_desc'] = SysAccount::where('id', $data['account_id'])->value('short_desc')??'';
+        }
+        if (isset($data['country_id'])) //付款来源国家
+            $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
+        if (isset($data['currency_id'])) //付款币种
+            $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
+        if (!empty($data['fx_receipt_file'])){
+            $data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
+        }elseif (isset($data['fx_receipt_file'])){
+            $data['fx_receipt_file_full'] = '';
+        }
+        
+        if (isset($data['created_by']))
+            $data['created_by'] = User::where('id', $data['created_by'])->value('name')??'';
+        if (isset($data['updated_by']))
+            $data['updated_by'] = User::where('id', $data['updated_by'])->value('name')??'';
+        return $data;
+    }
+
+    /**
+     * 数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function showFormat($data)
+    {
+        if (isset($data['created_at']))
+            $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']);
+        if (isset($data['arrived_at']))
+            $data['arrived_at'] = date('Y-m-d H:i:s', $data['arrived_at']);
+        if (isset($data['received_at']))
+            $data['received_at'] = date('Y-m-d H:i:s', $data['received_at']);
+        if (isset($data['account_id'])){ //收款账号
+            $data['account_name'] = SysAccount::where('id', $data['account_id'])->value('account_name')??'';
+            $data['account_short_desc'] = SysAccount::where('id', $data['account_id'])->value('short_desc')??'';
+        }
+        if (isset($data['country_id'])) //付款来源国家
+            $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr')??'';
+        if (isset($data['currency_id'])) //付款币种
+            $data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->value('currency_name')??'';
+        if (!empty($data['fx_receipt_file'])){
+            $data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
+        }elseif (isset($data['fx_receipt_file'])){
+            $data['fx_receipt_file_full'] = '';
+        }
+
+        if (isset($data['created_by']))
+            $data['created_by'] = User::where('id', $data['created_by'])->value('name')??'';
+        if (isset($data['updated_by']))
+            $data['updated_by'] = User::where('id', $data['updated_by'])->value('name')??'';
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/app/common/logic/FinPaymentApplyLogic.php b/app/common/logic/FinPaymentApplyLogic.php
new file mode 100644
index 0000000..09b93e1
--- /dev/null
+++ b/app/common/logic/FinPaymentApplyLogic.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace app\common\logic;
+
+use app\common\traits\crud\CrudLogicTrait;
+use app\common\model\FinPaymentApply;
+
+class FinPaymentApplyLogic
+{
+    use CrudLogicTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = FinPaymentApply::class;
+
+}
\ No newline at end of file
diff --git a/app/common/logic/FinReceiptHisLogic.php b/app/common/logic/FinReceiptHisLogic.php
new file mode 100644
index 0000000..3e90dac
--- /dev/null
+++ b/app/common/logic/FinReceiptHisLogic.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace app\common\logic;
+
+use app\common\traits\crud\CrudLogicTrait;
+use app\common\model\FinReceiptHis;
+
+class FinReceiptHisLogic
+{
+    use CrudLogicTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = FinReceiptHis::class;
+
+}
\ No newline at end of file
diff --git a/app/common/logic/FinReceiptLogic.php b/app/common/logic/FinReceiptLogic.php
new file mode 100644
index 0000000..5d8f5f3
--- /dev/null
+++ b/app/common/logic/FinReceiptLogic.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace app\common\logic;
+
+use app\common\traits\crud\CrudLogicTrait;
+use app\common\model\FinReceipt;
+
+class FinReceiptLogic
+{
+    use CrudLogicTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = FinReceipt::class;
+
+}
\ No newline at end of file
diff --git a/app/common/model/FinPaymentApply.php b/app/common/model/FinPaymentApply.php
new file mode 100644
index 0000000..f02f137
--- /dev/null
+++ b/app/common/model/FinPaymentApply.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace app\common\model;
+
+use support\Model;
+
+class FinPaymentApply extends Model
+{
+    /**
+     * The connection name for the model.
+     *
+     * @var string|null
+     */
+    protected $connection = 'mysql';
+    
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'fin_payment_apply';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = true;
+    
+    
+    protected $dateFormat = 'U';
+
+    /**
+     * 允许自动填充模型字段
+     */
+    protected $fillable = ['id', 'apply_no', 'doc_user_id', 'sales_user_id', 'corp_id', 'account_id', 'currency_id', 'amount', 'swift', 'remit_bank', 'country_id', 'remitter', 'exchange_rate', 'total_amount_cny', 'voucher_file', 'voucher_name', 'submit_files', 'created_at', 'updated_at'];
+
+    /**
+     * 不允许自动填充模型字段
+     */
+    protected $guarded = [];
+
+    /**
+     * 获取对应的收款记录（1-1，可为空）
+     */
+    public function receipt()
+    {
+        return $this->hasOne(FinReceipt::class, 'payment_apply_id', 'id');
+    }
+
+    /**
+     * 关联的备货单（通过中间表）
+     */
+    public function stocks()
+    {
+        return $this->belongsToMany(StockOrders::class, 'fin_payment_stock', 'payment_apply_id', 'stock_id');
+    }
+}
\ No newline at end of file
diff --git a/app/common/model/FinPaymentStock.php b/app/common/model/FinPaymentStock.php
new file mode 100644
index 0000000..d5b3d10
--- /dev/null
+++ b/app/common/model/FinPaymentStock.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace app\common\model;
+
+use support\Model;
+
+class FinPaymentStock extends Model
+{
+    /**
+     * The connection name for the model.
+     *
+     * @var string|null
+     */
+    protected $connection = 'mysql';
+    
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'fin_payment_stock';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = true;
+    
+    
+    protected $dateFormat = 'U';
+
+    /**
+     * 允许自动填充模型字段
+     */
+    protected $fillable = ['id', 'pi_no', 'payment_apply_id', 'receipt_id', 'stock_id', 'allocated_amount', 'allocated_amount_cny', 'updated_at', 'created_at'];
+
+    /**
+     * 不允许自动填充模型字段
+     */
+    protected $guarded = [];
+
+    // 付款申请
+    public function payment_apply()
+    {
+        return $this->belongsTo(FinPaymentApply::class, 'payment_apply_id', 'id');
+    }
+
+    // 收款记录
+    public function receipt()
+    {
+        return $this->belongsTo(FinReceipt::class, 'receipt_id', 'id');
+    }
+
+    // 备货单
+    public function stock()
+    {
+        return $this->belongsTo(StockOrders::class, 'stock_id', 'id');
+    }
+}
\ No newline at end of file
diff --git a/app/common/model/FinReceipt.php b/app/common/model/FinReceipt.php
new file mode 100644
index 0000000..7347be0
--- /dev/null
+++ b/app/common/model/FinReceipt.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace app\common\model;
+
+use support\Model;
+
+class FinReceipt extends Model
+{
+    /**
+     * The connection name for the model.
+     *
+     * @var string|null
+     */
+    protected $connection = 'mysql';
+    
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'fin_receipt';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = true;
+    
+    
+    protected $dateFormat = 'U';
+
+    /**
+     * 允许自动填充模型字段
+     */
+    protected $fillable = ['id', 'receipt_no', 'payment_apply_id', 'country_id', 'remitter', 'account_id', 'currency_id', 'amount', 'discount_amount', 'total_amount_cny', 'exchange_rate', 'arrived_at', 'received_at', 'voucher_no', 'fx_receipt_file', 'fx_receipt_file_name', 'is_domestic_return', 'created_by', 'updated_by', 'created_at', 'updated_at'];
+
+    /**
+     * 不允许自动填充模型字段
+     */
+    protected $guarded = [];
+
+    /**
+     * 对应的付款申请（1-1，可为空）
+     */
+    public function payment()
+    {
+        return $this->belongsTo(FinPaymentApply::class, 'payment_apply_id', 'id');
+    }
+
+    /**
+     * 关联的备货单（通过中间表）
+     */
+    public function stocks()
+    {
+        return $this->belongsToMany(StockOrders::class, 'fin_payment_stock', 'receipt_id', 'stock_id');
+    }
+}
\ No newline at end of file
diff --git a/app/common/model/FinReceiptHis.php b/app/common/model/FinReceiptHis.php
new file mode 100644
index 0000000..814b87f
--- /dev/null
+++ b/app/common/model/FinReceiptHis.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace app\common\model;
+
+use support\Model;
+
+class FinReceiptHis extends Model
+{
+    /**
+     * The connection name for the model.
+     *
+     * @var string|null
+     */
+    protected $connection = 'mysql';
+    
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'fin_receipt_his';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = true;
+    
+    
+    protected $dateFormat = 'U';
+
+    /**
+     * 允许自动填充模型字段
+     */
+    protected $fillable = ['id', 'receipt_id', 'receipt_no', 'payment_apply_id', 'country_id', 'remitter', 'account_id', 'currency_id', 'amount', 'discount_amount', 'total_amount_cny', 'exchange_rate', 'arrived_at', 'received_at', 'voucher_no', 'fx_receipt_file', 'is_domestic_return', 'created_by', 'updated_by', 'created_at', 'updated_at'];
+
+    /**
+     * 不允许自动填充模型字段
+     */
+    protected $guarded = [];
+}
\ No newline at end of file
diff --git a/app/common/model/StockOrders.php b/app/common/model/StockOrders.php
index 65f9b67..cc2d076 100644
--- a/app/common/model/StockOrders.php
+++ b/app/common/model/StockOrders.php
@@ -107,4 +107,20 @@ class StockOrders extends Model
     {
         return $this->hasOne(User::class, 'id', 'salesperson_id');
     }
+
+    /**
+     * 客户的标签
+     */
+    public function payment()
+    {
+        return $this->belongsToMany(FinPaymentApply::class, 'fin_payment_stock', 'stock_id', 'payment_apply_id');
+    }
+
+    /**
+     * 关联收款记录（多对多，经由中间表）
+     */
+    public function receipts()
+    {
+        return $this->belongsToMany(FinReceipt::class, 'fin_payment_stock', 'stock_id', 'receipt_id');
+    }
 }
\ No newline at end of file
diff --git a/app/common/service/FinPaymentApplyService.php b/app/common/service/FinPaymentApplyService.php
new file mode 100644
index 0000000..f451ce4
--- /dev/null
+++ b/app/common/service/FinPaymentApplyService.php
@@ -0,0 +1,236 @@
+<?php
+
+namespace app\common\service;
+
+use app\common\model\FinPaymentStock;
+use app\common\validate\FinPaymentApplyValidate;
+use app\common\traits\crud\CrudServiceTrait;
+use app\common\model\FinPaymentApply;
+use support\Redis;
+use support\Request;
+
+class FinPaymentApplyService
+{
+
+    use CrudServiceTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = FinPaymentApply::class;
+
+    /**
+     * 验证器
+     */
+    protected $validator = FinPaymentApplyValidate::class;
+
+    /**
+     * 获取验证器
+     */
+    public function getValidator()
+    {
+        return new $this->validator;
+    }
+
+    /**
+     * 构建查询条件
+     */
+    protected function buildQueryConfig(Request $request, string $scene = 'index'): array
+    {
+        $p = $request->all();
+
+        $config = [];
+        $config['model'] = $this->modelClass;
+        switch ($scene) {
+            case 'index':
+                // ====== ====== 排序 ====== ======
+                $config['order']['id'] = 'desc';
+
+                // ====== ====== 筛选 ====== ======
+                // 汇款国家
+                if (isset($p['country_id']) && !empty($p['country_id'])) {
+                    $config['where']['country_id'] = $p['country_id'];
+                }
+
+                // 收款账户筛选
+                if (isset($p['account_id']) && !empty($p['account_id'])) {
+                    $config['where']['account_id'] = $p['account_id'];
+                }
+
+                // 关键字
+                if (isset($p['keyword']) && $p['keyword']) {
+                    $k = '%' . $p['keyword'] . '%';
+                    $config['orWhere'][] = ['remitter', 'like', $k];
+                }
+                break;
+            case 'show':
+                $config['where']['id'] = $p['id'];
+                break;
+            case 'update':
+            case 'destroy':
+                $config['where']['id'] = $p['id'];
+                break;
+            case 'store':
+                break;
+        }
+
+        return $config;
+    }
+
+    public function beforeServiceStore($data, Request $request)
+    {
+        $data['apply_no'] = $this->generateUniqueApplyNo();
+        $data['doc_user_id'] = $request->user->uid;
+        $data['submit_files'] = json_encode($data['submit_files']);
+        redis::set('stock_' . $data['doc_user_id'], json_encode($request->post('stock')), 'EX', 30);
+        unset($data['stock']);
+        return $data;
+    }
+
+
+    public function afterServiceStore($res)
+    {
+        $data = [
+            'payment_apply_id' => $res['id'],
+        ];
+        $piStock = json_decode(redis::get('stock_' . $res['doc_user_id']), true);
+        redis::del('stock' . $res['doc_user_id']);
+        foreach ($piStock as $stock) {
+            foreach ($stock['stock_id'] as $v) {
+                $data['stock_id'] = $v;
+                $data['pi_no'] = $stock['pi_on'];
+                FinPaymentStock::create($data);
+            }
+        }
+    }
+
+    public function beforeServiceUpdate($data, Request $request)
+    {
+        $data['submit_files'] = json_encode($data['submit_files']);
+        return $data;
+    }
+
+    /**
+     * 生成唯一的付款申请编码
+     * 格式：PA + 日期 + 6位字母数字组合
+     *
+     * @return string 唯一编码
+     */
+    public function generateUniqueApplyNo()
+    {
+        $chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        $maxAttempts = 10; // 防止无限循环
+        $secondChar = 'PA' . date('Ymd');
+
+        for ($attempt = 0; $attempt < $maxAttempts; $attempt++) {
+            // 生成后6位随机字符
+            $suffix = '';
+            for ($i = 0; $i < 6; $i++) {
+                $suffix .= $chars[rand(0, strlen($chars) - 1)];
+            }
+
+            $applyNo = $secondChar . $suffix;
+
+            // 检查是否已存在
+            $existing = FinPaymentApply::where('apply_no', $applyNo)->first();
+            if (!$existing) {
+                return $applyNo;
+            }
+        }
+
+        // 如果1000次尝试后仍然重复，使用时间戳确保唯一性
+        $timestamp = substr(time(), -6);
+        return $secondChar . $timestamp;
+    }
+
+    /**
+     * 根据相似度排序付款记录
+     * @param Request $request
+     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|\Illuminate\Pagination\LengthAwarePaginator
+     */
+    public function complexQueryIndex(Request $request)
+    {
+        $limit = (int)$request->get('size', 15);
+        $page  = (int)$request->get('current',  1);
+        $param = $request->all();
+
+        $where = [];
+        
+        // 汇款国家
+        if (isset($param['country_id']) && !empty($param['country_id'])) {
+            $where[] = ['country_id', $param['country_id']];
+        }
+        // 收款账户筛选
+        if (isset($param['account_id']) && !empty($param['account_id'])) {
+            $where[] = ['account_id', $param['account_id']];
+        }
+
+        // 关键字
+        if (isset($param['keyword']) && $param['keyword']) {
+            $k = '%' . $param['keyword'] . '%';
+            $where[] = ['remitter', 'like', $k];
+        }
+
+        // 构建查询
+        $query = $this->modelClass::where($where);
+
+        // 应用是否有关联收款记录的筛选
+        $correlation = $param['correlation']??'';
+        if ($correlation === 'receipt') {
+            $query->whereHas('receipt');
+        } elseif ($correlation === 'unbind') {
+            $query->whereDoesntHave('receipt');
+        }
+
+        if (isset($param['scene']) && $param['scene'] == 'list') {
+            return $query->paginate($limit, ['*'], 'page', $page);
+        }
+
+        // 计算七天前的时间戳
+        $sevenDaysAgo = time() - (10 * 24 * 60 * 60);
+        
+        // 构建相似度排序逻辑
+        $similarityOrder = [];
+        
+        // 如果有传入参数，计算相似度
+        if (isset($param['account_id']) && !empty($param['account_id'])) {
+            $similarityOrder[] = "CASE WHEN account_id = {$param['account_id']} THEN 0 ELSE 1 END";
+        }
+        
+        if (isset($param['country_id']) && !empty($param['country_id'])) {
+            $similarityOrder[] = "CASE WHEN country_id = {$param['country_id']} THEN 0 ELSE 1 END";
+        }
+        
+        if (isset($param['keyword']) && $param['keyword']) {
+            $keyword = addslashes($param['keyword']);
+            $similarityOrder[] = "CASE WHEN remitter LIKE '%{$keyword}%' THEN 0 ELSE 1 END";
+        }
+        
+        if (isset($param['amount']) && !empty($param['amount'])) {
+            $amount = (float)$param['amount'];
+            $similarityOrder[] = "ABS(amount - {$amount})";
+        }
+        
+        // 构建排序SQL
+        $orderByClause = "";
+        if (!empty($similarityOrder)) {
+            $orderByClause = "CASE 
+                WHEN created_at >= {$sevenDaysAgo} THEN 
+                    (" . implode(' + ', $similarityOrder) . ")
+                ELSE 0
+            END ASC, ";
+        }
+        
+        $orderByClause .= "CASE 
+            WHEN created_at < {$sevenDaysAgo} THEN id 
+            ELSE 999999 
+        END DESC";
+
+        $orderByClause .= ", id DESC";
+        
+        $query->orderByRaw($orderByClause);
+
+        return $query->paginate($limit, ['*'], 'page', $page);
+    }
+
+}
\ No newline at end of file
diff --git a/app/common/service/FinReceiptHisService.php b/app/common/service/FinReceiptHisService.php
new file mode 100644
index 0000000..f43f77b
--- /dev/null
+++ b/app/common/service/FinReceiptHisService.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace app\common\service;
+
+use app\common\validate\FinReceiptHisValidate;
+use app\common\traits\crud\CrudServiceTrait;
+use app\common\model\FinReceiptHis;
+use support\exception\BusinessException;
+use support\Request;
+
+class FinReceiptHisService
+{
+
+    use CrudServiceTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = FinReceiptHis::class;
+
+    /**
+     * 验证器
+     */
+    protected $validator = FinReceiptHisValidate::class;
+
+    /**
+     * 获取验证器
+     */
+    public function getValidator()
+    {
+        return  new $this->validator;
+    }
+
+    /**
+     * 构建查询条件
+     */
+    protected function buildQueryConfig(Request $request, string $scene = 'index'): array
+    {
+        $p = $request->all();
+
+        $config = [];
+        $config['model'] = $this->modelClass;
+        switch ($scene) {
+            case 'index':
+                if(empty($p['receipt_id'])){
+                    throw new BusinessException('receipt_id不能为空');
+                }
+                // ====== ====== 排序 ====== ======
+                $config['order']['id'] = 'desc';
+
+                // ====== ====== 筛选 ====== ======
+                $config['where']['receipt_id'] = $p['receipt_id'];
+
+                break;
+            case 'show':
+                $config['where']['id'] = $p['id'];
+                break;
+        }
+
+        return $config;
+    }
+}
\ No newline at end of file
diff --git a/app/common/service/FinReceiptService.php b/app/common/service/FinReceiptService.php
new file mode 100644
index 0000000..155aecd
--- /dev/null
+++ b/app/common/service/FinReceiptService.php
@@ -0,0 +1,254 @@
+<?php
+
+namespace app\common\service;
+
+use app\common\model\FinReceiptHis;
+use app\common\validate\FinReceiptValidate;
+use app\common\traits\crud\CrudServiceTrait;
+use app\common\model\FinReceipt;
+use support\Request;
+
+class FinReceiptService
+{
+
+    use CrudServiceTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = FinReceipt::class;
+
+    /**
+     * 验证器
+     */
+    protected $validator = FinReceiptValidate::class;
+
+    /**
+     * 获取验证器
+     */
+    public function getValidator()
+    {
+        return  new $this->validator;
+    }
+
+
+    /**
+     * 构建查询条件
+     */
+    protected function buildQueryConfig(Request $request, string $scene = 'index'): array
+    {
+        $p = $request->all();
+
+        $config = [];
+        $config['model'] = $this->modelClass;
+        switch ($scene) {
+            case 'index':
+                // ====== ====== 排序 ====== ======
+                $config['order']['id'] = 'desc';
+
+                // ====== ====== 筛选 ====== ======
+                // 汇款国家
+                if (isset($p['country_id']) && !empty($p['country_id'])) {
+                    $config['where']['country_id'] = $p['country_id'];
+                }
+
+                // 没有付款记录的收款记录
+                if (isset($p['payment_apply']) && $p['payment_apply'] == 'not') {
+                    $config['where']['payment_apply_id'] = ['null'];
+                } elseif (isset($p['payment_apply']) && $p['payment_apply'] == 'already') {
+                    $config['where']['payment_apply_id'] = ['not null'];
+                }
+
+                // 收款申请筛选
+                if (isset($p['payment_apply_id']) && !empty($p['payment_apply_id'])) {
+                    $config['where']['payment_apply_id'] = $p['payment_apply_id'];
+                }
+
+                // 收款账户筛选
+                if (isset($p['account_id']) && !empty($p['account_id'])) {
+                    $config['where']['account_id'] = $p['account_id'];
+                }
+
+                // 关键字
+                if (isset($p['keyword']) && $p['keyword']) {
+                    $k = '%' . $p['keyword'] . '%';
+                    $config['orWhere'][] = ['remitter', 'like', $k];
+                }
+                break;
+            case 'show':
+                $config['where']['id'] = $p['id'];
+                break;
+            case 'update':
+            case 'destroy':
+                $config['where']['id'] = $p['id'];
+                break;
+            case 'store':
+                break;
+        }
+
+        return $config;
+    }
+
+    public function beforeServiceStore($data, Request $request)
+    {
+        if(isset($data['payment_apply_id']) && empty($data['payment_apply_id'])){
+            unset($data['payment_apply_id']);
+        }
+        $data['receipt_no'] = $this->generateUniqueReceipt();
+        $data['arrived_at'] = strtotime( $data['arrived_at']);
+        $data['created_by'] = $request->user->uid;
+        $data['updated_by'] = $request->user->uid;
+        return $data;
+    }
+
+    public function afterServiceStore($res)
+    {
+        $receipt = FinReceipt::where('id',$res->id)->first()->toArray();
+        $receipt = array_merge($receipt,['receipt_id' => $res->id]);
+        unset($receipt['id']);
+        FinReceiptHis::create($receipt);
+    }
+
+    public function beforeServiceUpdate($data, Request $request)
+    {
+        $data['updated_by'] = $request->user->uid;
+        if(isset($data['arrived_at']))
+            $data['arrived_at'] = strtotime($data['arrived_at']);
+        if(isset($data['received_at']))
+            $data['received_at'] = strtotime($data['received_at']);
+        
+        return $data;
+    }
+    public function afterServiceUpdate($res)
+    {
+        $receipt = FinReceipt::where('id',$res['id'])->first()->toArray();
+        $receipt = array_merge($receipt,['receipt_id' => $res['id']]);
+        unset($receipt['id']);
+        FinReceiptHis::create($receipt);
+    }
+
+
+    /**
+     * 生成唯一的付款申请编码
+     * 格式：PA + 日期 + 6位字母数字组合
+     *
+     * @return string 唯一编码
+     */
+    public function generateUniqueReceipt()
+    {
+        $chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        $maxAttempts = 10; // 防止无限循环
+        $secondChar = 'RE' . date('Ymd');
+
+        for ($attempt = 0; $attempt < $maxAttempts; $attempt++) {
+            // 生成后6位随机字符
+            $suffix = '';
+            for ($i = 0; $i < 6; $i++) {
+                $suffix .= $chars[rand(0, strlen($chars) - 1)];
+            }
+
+            $ReceiptNo = $secondChar . $suffix;
+
+            // 检查是否已存在
+            $existing = FinReceipt::where('receipt_no', $ReceiptNo)->first();
+            if (!$existing) {
+                return $ReceiptNo;
+            }
+        }
+
+        // 如果1000次尝试后仍然重复，使用时间戳确保唯一性
+        $timestamp = substr(time(), -6);
+        return $secondChar . $timestamp;
+    }
+
+    /**
+     * 根据相似度排序付款记录
+     * @param Request $request
+     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|\Illuminate\Pagination\LengthAwarePaginator
+     */
+    public function complexQueryIndex(Request $request)
+    {
+        $limit = (int)$request->get('size', 15);
+        $page  = (int)$request->get('current',  1);
+        $param = $request->all();
+
+        $where = [];
+
+        // 汇款国家
+        if (isset($param['country_id']) && !empty($param['country_id'])) {
+            $where[] = ['country_id', $param['country_id']];
+        }
+        // 收款账户筛选
+        if (isset($param['account_id']) && !empty($param['account_id'])) {
+            $where[] = ['account_id', $param['account_id']];
+        }
+        // 收款申请筛选
+        if (isset($param['payment_apply_id']) && !empty($param['payment_apply_id'])) {
+            $where[]['payment_apply_id'] = $param['payment_apply_id'];
+        }
+
+        // 关键字
+        if (isset($param['keyword']) && $param['keyword']) {
+            $k = '%' . $param['keyword'] . '%';
+            $where[] = ['remitter', 'like', $k];
+        }
+
+        // 构建查询
+        $query = $this->modelClass::where($where);
+
+        // 没有付款记录的收款记录
+        if (isset($param['payment_apply']) && $param['payment_apply'] == 'not') {
+            $query->whereNull('payment_apply_id');
+        } elseif (isset($param['payment_apply']) && $param['payment_apply'] == 'already') {
+            $query->whereNotNull('payment_apply_id');
+        }
+
+        if (isset($param['scene']) && $param['scene'] == 'list') {
+            return $query->paginate($limit, ['*'], 'page', $page);
+        }
+
+        // 计算七天前的时间戳
+        $sevenDaysAgo = time() - (10 * 24 * 60 * 60);
+
+        // 构建相似度排序逻辑
+        $similarityOrder = [];
+
+        // 如果有传入参数，计算相似度
+        if (isset($param['account_id']) && !empty($param['account_id'])) {
+            $similarityOrder[] = "CASE WHEN account_id = {$param['account_id']} THEN 0 ELSE 1 END";
+        }
+
+        if (isset($param['country_id']) && !empty($param['country_id'])) {
+            $similarityOrder[] = "CASE WHEN country_id = {$param['country_id']} THEN 0 ELSE 1 END";
+        }
+
+        if (isset($param['keyword']) && $param['keyword']) {
+            $keyword = addslashes($param['keyword']);
+            $similarityOrder[] = "CASE WHEN remitter LIKE '%{$keyword}%' THEN 0 ELSE 1 END";
+        }
+
+        if (isset($param['amount']) && !empty($param['amount'])) {
+            $amount = (float)$param['amount'];
+            $similarityOrder[] = "ABS(amount - {$amount})";
+        }
+
+        // 构建排序SQL
+        $orderByClause = "";
+        if (!empty($similarityOrder)) {
+            $orderByClause = "CASE 
+                WHEN created_at >= {$sevenDaysAgo} THEN 
+                    (" . implode(' + ', $similarityOrder) . ")
+                ELSE 999999
+            END ASC, ";
+        }
+
+        $orderByClause .= "CASE 
+            WHEN created_at < {$sevenDaysAgo} THEN id 
+            ELSE 0 
+        END DESC";
+
+        $query->orderByRaw($orderByClause);
+
+        return $query->paginate($limit, ['*'], 'page', $page);
+    }
+}
\ No newline at end of file
diff --git a/app/common/validate/FinPaymentApplyValidate.php b/app/common/validate/FinPaymentApplyValidate.php
new file mode 100644
index 0000000..58145e3
--- /dev/null
+++ b/app/common/validate/FinPaymentApplyValidate.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace app\common\validate;
+
+use think\Validate;
+
+class FinPaymentApplyValidate extends Validate
+{
+    // 规则
+    protected $rule = [
+        
+    ];
+
+    // 提示
+    protected $message = [
+        
+    ];
+
+    // 场景
+    protected $scene = [
+        'store' => [
+            
+        ],
+
+        'update' => [
+            
+        ]
+    ];
+}
\ No newline at end of file
diff --git a/app/common/validate/FinReceiptHisValidate.php b/app/common/validate/FinReceiptHisValidate.php
new file mode 100644
index 0000000..7a1f7c4
--- /dev/null
+++ b/app/common/validate/FinReceiptHisValidate.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace app\common\validate;
+
+use think\Validate;
+
+class FinReceiptHisValidate extends Validate
+{
+    // 规则
+    protected $rule = [
+        
+    ];
+
+    // 提示
+    protected $message = [
+        
+    ];
+
+    // 场景
+    protected $scene = [
+        'store' => [
+            
+        ],
+
+        'update' => [
+            
+        ]
+    ];
+}
\ No newline at end of file
diff --git a/app/common/validate/FinReceiptValidate.php b/app/common/validate/FinReceiptValidate.php
new file mode 100644
index 0000000..237b03e
--- /dev/null
+++ b/app/common/validate/FinReceiptValidate.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace app\common\validate;
+
+use think\Validate;
+
+class FinReceiptValidate extends Validate
+{
+    // 规则
+    protected $rule = [
+//        'payment_apply_id'      => 'integer|gt:0',
+//        'country_id'            => 'require|integer|gt:0',
+//        'remitter'              => 'require',
+//        'account_id'            => 'require|integer|gt:0',
+//        'currency_id'           => 'require|integer|gt:0',
+//        'amount'                => 'require|gt:0',
+//        'exchange_rate'         => 'require|gt:0',
+//        'arrived_at'            => 'require',
+//        'is_domestic_return'    => 'require|integer',
+    ];
+
+    // 提示
+    protected $message = [
+//        'payment_apply_id.integer'          => '付款申请ID必须是整数',
+//        'payment_apply_id.gt'               => '付款申请ID必须大于0',
+//        'country_id.require'                => '付款来源国家ID不能为空',
+//        'country_id.integer'                => '付款来源国家ID必须是整数',
+//        'country_id.gt'                     => '付款来源国家ID必须大于0',
+//        'remitter.require'                  => '汇款人不能为空',
+//        'account_id.require'                => '收款账号ID不能为空',
+//        'account_id.integer'                => '收款账号ID必须是整数',
+//        'account_id.gt'                     => '收款账号ID必须大于0',
+//        'currency_id.require'               => '收款币种ID不能为空',
+//        'currency_id.integer'               => '收款币种ID必须是整数',
+//        'currency_id.gt'                    => '收款币种ID必须大于0',
+//        'amount.require'                    => '收款金额不能为空',
+//        'amount.gt'                         => '收款金额必须大于0',
+//        'exchange_rate.require'             => '实际汇率不能为空',
+//        'exchange_rate.gt'                  => '实际汇率必须大于0',
+//        'arrived_at.require'                => '到账时间不能为空',
+//        'arrived_at.gt'                     => '到账时间必须大于0',
+//        'is_domestic_return.require'        => '是否回转内地不能为空',
+//        'is_domestic_return.integer'        => '是否回转内地必须是整数',
+    ];
+
+    // 场景
+    protected $scene = [
+        'store' => [
+//            'payment_apply_id', 'country_id', 'remitter', 'account_id', 'currency_id', 'amount', 'exchange_rate', 'arrived_at'
+        ],
+
+        'update' => [
+//            'payment_apply_id'
+        ]
+    ];
+}
\ No newline at end of file
diff --git a/config/route.php b/config/route.php
index 2fafd16..5f6e05d 100644
--- a/config/route.php
+++ b/config/route.php
@@ -389,7 +389,6 @@ Route::group('/admin', function () {
         });
     });
 
-
     Route::group('/purchase/order', function () {
         Route::any('/predata', [app\common\controller\PurchaseOrdersController::class, 'preQueryData']);
         Route::any('/list', [app\common\controller\PurchaseOrdersController::class, 'index']);
@@ -422,6 +421,30 @@ Route::group('/admin', function () {
         Route::any('/update', [app\common\controller\SysUpdateLogController::class, 'update']);
         Route::any('/destroy', [app\common\controller\SysUpdateLogController::class, 'destroy']);
     });
+
+    // 收款记录
+    Route::group('/receipt', function () {
+        Route::any('/list', [app\common\controller\FinReceiptController::class, 'index']);
+        Route::any('/show', [app\common\controller\FinReceiptController::class, 'show']);
+        Route::any('/store', [app\common\controller\FinReceiptController::class, 'store']);
+        Route::any('/update', [app\common\controller\FinReceiptController::class, 'update']);
+        Route::any('/payment', [app\common\controller\FinReceiptController::class, 'update']);
+        Route::any('/destroy', [app\common\controller\FinReceiptController::class, 'destroy']);
+    });
+    // 收款记录历史
+    Route::group('/receipt/his', function () {
+        Route::any('/list', [app\common\controller\FinReceiptHisController::class, 'index']);
+        Route::any('/show', [app\common\controller\FinReceiptHisController::class, 'show']);
+    });
+
+    // 付款申请
+    Route::group('/payment', function () {
+        Route::any('/list', [app\common\controller\FinPaymentApplyController::class, 'index']);
+        Route::any('/show', [app\common\controller\FinPaymentApplyController::class, 'show']);
+        Route::any('/store', [app\common\controller\FinPaymentApplyController::class, 'store']);
+        Route::any('/update', [app\common\controller\FinPaymentApplyController::class, 'update']);
+        Route::any('/destroy', [app\common\controller\FinPaymentApplyController::class, 'destroy']);
+    });
 });