From 0ba370e6abcaf1defa788a0f3ccdf00593c3a557 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Wed, 27 Mar 2024 16:25:03 +0800
Subject: [PATCH] update

---
 .../cost_project/CostApprovedProjectController.php     | 10 ++++++++++
 .../validate/financial/FinancialRefundValidate.php     |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/controller/cost_project/CostApprovedProjectController.php b/app/adminapi/controller/cost_project/CostApprovedProjectController.php
index 45d9e137b..59d8c3222 100644
--- a/app/adminapi/controller/cost_project/CostApprovedProjectController.php
+++ b/app/adminapi/controller/cost_project/CostApprovedProjectController.php
@@ -74,10 +74,20 @@
 				->order('id desc')
 				->select()
 				->each(function ($data) {
+					$invoice_ids = FinancialInvoice::where('contract_id', $data['id'])->column('id');
 					//开票金额
 					$data['total_invoice_amount'] = FinancialInvoice::where('contract_id', $data['id'])->sum('apply_amount');
+					//未开票金额
+					$data['not_total_invoice_amount'] = bcsub($data['money'], $data['total_invoice_amount'], 2);
 					//到账金额
 					$data['total_refund_amount'] = FinancialRefund::where('contract_id', $data['id'])->sum('amount');
+					//未到账金额
+					$data['not_total_refund_amount'] = bcsub($data['money'], $data['total_refund_amount'], 2);
+					//开票未回款金额
+					$invoice_has_refund_amount = FinancialRefund::where('contract_id', $data['id'])->where('invoice_id', 'in', $invoice_ids)->sum('amount');
+					$data['invoice_not_refund_amount'] = bcsub($data['total_invoice_amount'], $invoice_has_refund_amount, 2);
+					//回款未开票金额
+					$data['refund_not_invoice_amount'] = bcsub($data['total_refund_amount'], $invoice_has_refund_amount, 2);
 					//结算金额
 					$data['total_settlement_amount'] = FinancialSettlement::where('contract_id', $data['id'])->sum('amount');
 					$financial_settlement = FinancialSettlement::where('contract_id', $data['id'])->order('id desc')->findOrEmpty();
diff --git a/app/adminapi/validate/financial/FinancialRefundValidate.php b/app/adminapi/validate/financial/FinancialRefundValidate.php
index c330d7b7a..d9bb93b93 100644
--- a/app/adminapi/validate/financial/FinancialRefundValidate.php
+++ b/app/adminapi/validate/financial/FinancialRefundValidate.php
@@ -36,7 +36,7 @@
 		protected $rule = [
 			'id' => 'require|checkData',
 			'contract_id' => 'require|checkContract',
-			'invoice_id' => 'require|checkInvoice',
+			'invoice_id' => 'checkInvoice',
 			'amount' => 'require|float|gt:0',
 			'date' => 'require|dateFormat:Y-m-d',
 			'create_user' => 'require',