From 4891c6c3cf9f1aca22f7595d0e553d75dfe8539c Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Mon, 27 May 2024 18:48:26 +0800
Subject: [PATCH] update

---
 .../controller/works/finance/ExpenseController.php        | 2 +-
 .../controller/works/finance/IncomeController.php         | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/controller/works/finance/ExpenseController.php b/app/adminapi/controller/works/finance/ExpenseController.php
index 7af4831aa..a4ce3a2bc 100644
--- a/app/adminapi/controller/works/finance/ExpenseController.php
+++ b/app/adminapi/controller/works/finance/ExpenseController.php
@@ -161,7 +161,7 @@
 		}
 		
 		public function detail(){
-			$params = (new ExpenseValidate())->post()->goCheck('detail');
+			$params = (new ExpenseValidate())->get()->goCheck('detail');
 			$data = Db::name('oa_expense')->where('id',$params['id'])->find();
 			$data['check_status_text'] = match ($data['check_status']){
 				0=>'待审核',1=>'审核中',2=>'审核通过',3=>'审核不通过',4=>'撤销审核'
diff --git a/app/adminapi/controller/works/finance/IncomeController.php b/app/adminapi/controller/works/finance/IncomeController.php
index e2713dfc1..9aa0f0b6a 100644
--- a/app/adminapi/controller/works/finance/IncomeController.php
+++ b/app/adminapi/controller/works/finance/IncomeController.php
@@ -69,6 +69,7 @@
 				return $this->fail('到账记录数据格式错误');
 			}
 			$income_amount = 0;
+			$save_data = [];
 			foreach($params['detail'] as $k=>$v){
 				if(empty($v['enter_time']) || !strtotime($v['enter_time'])){
 					return $this->fail('到账记录第'.($k+1).'行到账日期为空');
@@ -77,13 +78,18 @@
 					return $this->fail('到账记录第'.($k+1).'行到帐金额为空');
 				}
 				$income_amount += $v['amount'];
+				$save_data[] = [
+					'inid' => $params['invoice_id'],
+					'amount' => $params['amount'],
+					'admin_id' => $this->adminId,
+					''
+				];
 			}
 			if($income_amount > (bcsub($invoice['amount'],$invoice['enter_amount'],2))){
 				return $this->fail('到账金额大于发票金额，不允许保存');
 			}
 			Db::startTrans();
 			try {
-				
 				Db::commit();
 				return $this->success('ok');
 			} catch (\Exception $e) {