mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-03-25 15:19:31 +08:00
parent 23a6b23314
commit b35219cd6a
2 changed files with 400 additions and 383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/adminapi/logic/finance/FinancePaymentApplyLogic.php
View File

@ -15,6 +15,7 @@
namespace app\adminapi\logic\finance; namespace app\adminapi\logic\finance;
use app\common\logic\BaseLogic;
use app\common\model\bank\BankAccount; use app\common\model\bank\BankAccount;
use app\common\model\contract\ProcurementContract; use app\common\model\contract\ProcurementContract;
use app\common\model\contract\SubcontractingContract; use app\common\model\contract\SubcontractingContract;
@ -22,7 +23,6 @@ use app\common\model\finance\FinancePaymentApply;
use app\common\model\finance\FinancePaymentPlan; use app\common\model\finance\FinancePaymentPlan;
use app\common\model\oa\FlowApprove; use app\common\model\oa\FlowApprove;
use app\common\model\project\Project; use app\common\model\project\Project;
use app\common\logic\BaseLogic;
use app\common\model\supplier\Supplier; use app\common\model\supplier\Supplier;
use think\facade\Db; use think\facade\Db;
@ -53,6 +53,12 @@ class FinancePaymentApplyLogic extends BaseLogic
self::setError('合同信息不存在'); self::setError('合同信息不存在');
return false; return false;
} }
$finance_payment_plan = FinancePaymentPlan::where('id', $params['finance_payment_plan_id'])->findOrEmpty();
if ($finance_payment_plan['amount'] < $params['amount']) {
$status = 2;
} else {
$status = 3;
}
Db::startTrans(); Db::startTrans();
try { try {
FinancePaymentApply::create([ FinancePaymentApply::create([
@ -76,6 +82,9 @@ class FinancePaymentApplyLogic extends BaseLogic
'payee_account' => $params['payee_account'], 'payee_account' => $params['payee_account'],
'bank_account_id' => $params['bank_account_id'], 'bank_account_id' => $params['bank_account_id'],
]); ]);
FinancePaymentPlan::where('id', $params['finance_payment_plan_id'])->update([
'status' => $status
]);
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
@ -103,6 +112,12 @@ class FinancePaymentApplyLogic extends BaseLogic
self::setError('合同信息不存在'); self::setError('合同信息不存在');
return false; return false;
} }
$finance_payment_plan = FinancePaymentPlan::where('id', $params['finance_payment_plan_id'])->findOrEmpty();
if ($finance_payment_plan['amount'] < $params['amount']) {
$status = 2;
} else {
$status = 3;
}
Db::startTrans(); Db::startTrans();
try { try {
FinancePaymentApply::where('id', $params['id'])->update([ FinancePaymentApply::where('id', $params['id'])->update([
@ -126,7 +141,9 @@ class FinancePaymentApplyLogic extends BaseLogic
'bank_account_id' => $params['bank_account_id'], 'bank_account_id' => $params['bank_account_id'],
'update_time' => time(), 'update_time' => time(),
]); ]);
FinancePaymentPlan::where('id', $params['finance_payment_plan_id'])->update([
'status' => $status
]);
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
@ -186,7 +203,8 @@ class FinancePaymentApplyLogic extends BaseLogic
return $data->toArray(); return $data->toArray();
} }
public static function approve($params,$admin_id): bool{ public static function approve($params, $admin_id): bool
{
$data = FinancePaymentApply::where('id', $params['id'])->findOrEmpty(); $data = FinancePaymentApply::where('id', $params['id'])->findOrEmpty();
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty(); $approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) { if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {

7
app/adminapi/logic/finance/FinancePaymentPlanLogic.php
View File

@ -15,12 +15,12 @@
namespace app\adminapi\logic\finance; namespace app\adminapi\logic\finance;
use app\common\logic\BaseLogic;
use app\common\model\contract\ProcurementContract; use app\common\model\contract\ProcurementContract;
use app\common\model\contract\SubcontractingContract; use app\common\model\contract\SubcontractingContract;
use app\common\model\finance\FinancePaymentPlan; use app\common\model\finance\FinancePaymentPlan;
use app\common\model\oa\FlowApprove; use app\common\model\oa\FlowApprove;
use app\common\model\project\Project; use app\common\model\project\Project;
use app\common\logic\BaseLogic;
use app\common\model\supplier\Supplier; use app\common\model\supplier\Supplier;
use think\facade\Db; use think\facade\Db;
@ -62,7 +62,6 @@ class FinancePaymentPlanLogic extends BaseLogic
'pay_date' => strtotime($params['pay_date']), 'pay_date' => strtotime($params['pay_date']),
'amount' => $params['amount'], 'amount' => $params['amount'],
'foreign_currency_remark' => $params['foreign_currency_remark'] ?? '', 'foreign_currency_remark' => $params['foreign_currency_remark'] ?? '',
'status' => $params['status'],
'remark' => $params['remark'] ?? '', 'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]); ]);
@ -104,7 +103,6 @@ class FinancePaymentPlanLogic extends BaseLogic
'pay_date' => strtotime($params['pay_date']), 'pay_date' => strtotime($params['pay_date']),
'amount' => $params['amount'], 'amount' => $params['amount'],
'foreign_currency_remark' => $params['foreign_currency_remark'] ?? '', 'foreign_currency_remark' => $params['foreign_currency_remark'] ?? '',
'status' => $params['status'],
'remark' => $params['remark'] ?? '', 'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]); ]);
@ -163,7 +161,8 @@ class FinancePaymentPlanLogic extends BaseLogic
return $data->toArray(); return $data->toArray();
} }
public static function approve($params,$admin_id): bool{ public static function approve($params, $admin_id): bool
{
$data = FinancePaymentPlan::where('id', $params['id'])->findOrEmpty(); $data = FinancePaymentPlan::where('id', $params['id'])->findOrEmpty();
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty(); $approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) { if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {