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:33:25 +08:00
parent b35219cd6a
commit 2b94fbc528
3 changed files with 350 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,10 +54,10 @@
return false; return false;
} }
$finance_payment_plan = FinancePaymentPlan::where('id', $params['finance_payment_plan_id'])->findOrEmpty(); $finance_payment_plan = FinancePaymentPlan::where('id', $params['finance_payment_plan_id'])->findOrEmpty();
if ($finance_payment_plan['amount'] < $params['amount']) { if ($params['amount'] >= $finance_payment_plan['amount']) {
$status = 2;
} else {
$status = 3; $status = 3;
} else {
$status = 2;
} }
Db::startTrans(); Db::startTrans();
try { try {
@ -113,10 +113,10 @@
return false; return false;
} }
$finance_payment_plan = FinancePaymentPlan::where('id', $params['finance_payment_plan_id'])->findOrEmpty(); $finance_payment_plan = FinancePaymentPlan::where('id', $params['finance_payment_plan_id'])->findOrEmpty();
if ($finance_payment_plan['amount'] < $params['amount']) { if ($params['amount'] >= $finance_payment_plan['amount']) {
$status = 2;
} else {
$status = 3; $status = 3;
} else {
$status = 2;
} }
Db::startTrans(); Db::startTrans();
try { try {

9
app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php
View File

@ -15,13 +15,13 @@
namespace app\adminapi\logic\finance; namespace app\adminapi\logic\finance;
use app\common\logic\BaseLogic;
use app\common\model\auth\Admin; use app\common\model\auth\Admin;
use app\common\model\contract\Contract; use app\common\model\contract\Contract;
use app\common\model\custom\Custom;
use app\common\model\finance\FinanceReturnedMoney; use app\common\model\finance\FinanceReturnedMoney;
use app\common\logic\BaseLogic;
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\model\custom\Custom;
use think\facade\Db; use think\facade\Db;
@ -52,7 +52,6 @@ class FinanceReturnedMoneyLogic extends BaseLogic
'return_date' => strtotime($params['return_date']), 'return_date' => strtotime($params['return_date']),
'period' => $params['period'], 'period' => $params['period'],
'amount' => $params['amount'], 'amount' => $params['amount'],
'return_status' => $params['return_status'],
'return_duty_id' => $params['return_duty_id'], 'return_duty_id' => $params['return_duty_id'],
'remark' => $params['remark'] ?? '', 'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
@ -85,7 +84,6 @@ class FinanceReturnedMoneyLogic extends BaseLogic
'return_date' => strtotime($params['return_date']), 'return_date' => strtotime($params['return_date']),
'period' => $params['period'], 'period' => $params['period'],
'amount' => $params['amount'], 'amount' => $params['amount'],
'return_status' => $params['return_status'],
'return_duty_id' => $params['return_duty_id'], 'return_duty_id' => $params['return_duty_id'],
'remark' => $params['remark'] ?? '', 'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
@ -140,7 +138,8 @@ class FinanceReturnedMoneyLogic 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 = FinanceReturnedMoney::where('id', $params['id'])->findOrEmpty(); $data = FinanceReturnedMoney::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) {

23
app/adminapi/logic/finance/FinanceReturnedRecordLogic.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\bank\BankAccount; use app\common\model\bank\BankAccount;
use app\common\model\contract\Contract; use app\common\model\contract\Contract;
use app\common\model\custom\Custom; use app\common\model\custom\Custom;
use app\common\model\finance\FinanceReturnedMoney; use app\common\model\finance\FinanceReturnedMoney;
use app\common\model\finance\FinanceReturnedRecord; use app\common\model\finance\FinanceReturnedRecord;
use app\common\logic\BaseLogic;
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 think\facade\Db; use think\facade\Db;
@ -46,6 +46,12 @@ class FinanceReturnedRecordLogic extends BaseLogic
{ {
$contract = Contract::field('project_id')->where('id', $params['contract_id'])->findOrEmpty(); $contract = Contract::field('project_id')->where('id', $params['contract_id'])->findOrEmpty();
Db::startTrans(); Db::startTrans();
$finance_returned_money = FinanceReturnedMoney::where('id', $params['finance_returned_money_id'])->findOrEmpty();
if ($params['amount'] >= $finance_returned_money['amount']) {
$status = 3;
} else {
$status = 2;
}
try { try {
FinanceReturnedRecord::create([ FinanceReturnedRecord::create([
'project_id' => $contract['project_id'], 'project_id' => $contract['project_id'],
@ -62,6 +68,9 @@ class FinanceReturnedRecordLogic extends BaseLogic
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
'bank_account_id' => $params['bank_account_id'], 'bank_account_id' => $params['bank_account_id'],
]); ]);
FinanceReturnedMoney::where('id', $params['finance_returned_money_id'])->update([
'return_status' => $status
]);
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
@ -82,6 +91,12 @@ class FinanceReturnedRecordLogic extends BaseLogic
public static function edit(array $params): bool public static function edit(array $params): bool
{ {
$contract = Contract::field('project_id')->where('id', $params['contract_id'])->findOrEmpty(); $contract = Contract::field('project_id')->where('id', $params['contract_id'])->findOrEmpty();
$finance_returned_money = FinanceReturnedMoney::where('id', $params['finance_returned_money_id'])->findOrEmpty();
if ($params['amount'] >= $finance_returned_money['amount']) {
$status = 3;
} else {
$status = 2;
}
Db::startTrans(); Db::startTrans();
try { try {
FinanceReturnedRecord::where('id', $params['id'])->update([ FinanceReturnedRecord::where('id', $params['id'])->update([
@ -100,6 +115,9 @@ class FinanceReturnedRecordLogic extends BaseLogic
'bank_account_id' => $params['bank_account_id'], 'bank_account_id' => $params['bank_account_id'],
'update_time' => time(), 'update_time' => time(),
]); ]);
FinanceReturnedMoney::where('id', $params['finance_returned_money_id'])->update([
'return_status' => $status
]);
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
@ -153,7 +171,8 @@ class FinanceReturnedRecordLogic 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 = FinanceReturnedRecord::where('id', $params['id'])->findOrEmpty(); $data = FinanceReturnedRecord::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) {