From 2b94fbc528c997d4336784c957f38e28c9683843 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Mon, 25 Mar 2024 15:33:25 +0800 Subject: [PATCH] update --- .../finance/FinancePaymentApplyLogic.php | 12 +- .../finance/FinanceReturnedMoneyLogic.php | 311 ++++++++------- .../finance/FinanceReturnedRecordLogic.php | 359 +++++++++--------- 3 files changed, 350 insertions(+), 332 deletions(-) diff --git a/app/adminapi/logic/finance/FinancePaymentApplyLogic.php b/app/adminapi/logic/finance/FinancePaymentApplyLogic.php index 12f0a51a4..913a7e612 100644 --- a/app/adminapi/logic/finance/FinancePaymentApplyLogic.php +++ b/app/adminapi/logic/finance/FinancePaymentApplyLogic.php @@ -54,10 +54,10 @@ return false; } $finance_payment_plan = FinancePaymentPlan::where('id', $params['finance_payment_plan_id'])->findOrEmpty(); - if ($finance_payment_plan['amount'] < $params['amount']) { - $status = 2; - } else { + if ($params['amount'] >= $finance_payment_plan['amount']) { $status = 3; + } else { + $status = 2; } Db::startTrans(); try { @@ -113,10 +113,10 @@ return false; } $finance_payment_plan = FinancePaymentPlan::where('id', $params['finance_payment_plan_id'])->findOrEmpty(); - if ($finance_payment_plan['amount'] < $params['amount']) { - $status = 2; - } else { + if ($params['amount'] >= $finance_payment_plan['amount']) { $status = 3; + } else { + $status = 2; } Db::startTrans(); try { diff --git a/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php index 388243eb7..9fa9bc561 100644 --- a/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php +++ b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php @@ -11,163 +11,162 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\finance; - - -use app\common\model\auth\Admin; -use app\common\model\contract\Contract; -use app\common\model\finance\FinanceReturnedMoney; -use app\common\logic\BaseLogic; -use app\common\model\oa\FlowApprove; -use app\common\model\project\Project; -use app\common\model\custom\Custom; -use think\facade\Db; - - -/** - * FinanceReturnedMoney逻辑 - * Class FinanceReturnedMoneyLogic - * @package app\adminapi\logic\finance - */ -class FinanceReturnedMoneyLogic extends BaseLogic -{ - - - /** - * @notes 添加 - * @param array $params - * @return bool - * @author likeadmin - * @date 2023/12/13 15:38 - */ - public static function add(array $params): bool - { - $contract = Contract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty(); - Db::startTrans(); - try { - FinanceReturnedMoney::create([ - 'project_id' => $contract['project_id'], - 'contract_id' => $params['contract_id'], - 'return_date' => strtotime($params['return_date']), - 'period' => $params['period'], - 'amount' => $params['amount'], - 'return_status' => $params['return_status'], - 'return_duty_id' => $params['return_duty_id'], - 'remark' => $params['remark'] ?? '', - 'annex' => $params['annex']? json_encode($params['annex']) : null, - ]); - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - self::setError($e->getMessage()); - return false; - } - } - - - /** - * @notes 编辑 - * @param array $params - * @return bool - * @author likeadmin - * @date 2023/12/13 15:38 - */ - public static function edit(array $params): bool - { - $contract = Contract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty(); - Db::startTrans(); - try { - FinanceReturnedMoney::where('id', $params['id'])->update([ - 'project_id' => $contract['project_id'], - 'contract_id' => $params['contract_id'], - 'return_date' => strtotime($params['return_date']), - 'period' => $params['period'], - 'amount' => $params['amount'], - 'return_status' => $params['return_status'], - 'return_duty_id' => $params['return_duty_id'], - 'remark' => $params['remark'] ?? '', - 'annex' => $params['annex']? json_encode($params['annex']) : null, - ]); - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - self::setError($e->getMessage()); - return false; - } - } - - - /** - * @notes 删除 - * @param array $params - * @return bool - * @author likeadmin - * @date 2023/12/13 15:38 - */ - public static function delete(array $params): bool - { - return FinanceReturnedMoney::destroy($params['id']); - } - - - /** - * @notes 获取详情 - * @param $params - * @return array - * @author likeadmin - * @date 2023/12/13 15:38 - */ - public static function detail($params): array - { - $data = FinanceReturnedMoney::field('id,project_id,contract_id,return_date,period,amount,return_status,return_duty_id,remark,annex,approve_id')->findOrEmpty($params['id']); - $project = Project::field('custom_id,name,project_code')->where('id',$data['project_id'])->findOrEmpty(); - $custom = Custom::field('name')->where('id',$project['custom_id'])->findOrEmpty(); - $contract = Contract::field('contract_name,contract_code')->where('id',$data['contract_id'])->findOrEmpty(); - $return_duty = Admin::field('name')->where('id',$data['return_duty_id'])->findOrEmpty(); - $data['project_name'] = $project['name']; - $data['project_code'] = $project['project_code']; - $data['custom_name'] = $custom['name']; - $data['contract_name'] = $contract['contract_name']; - $data['contract_code'] = $contract['contract_code']; - $data['period_text'] = $data->period_text; - $data['return_status_text'] = $data->return_status_text; - $data['return_duty'] = $return_duty['name']; - $approve_data = FlowApprove::where('id',$data['approve_id'])->findOrEmpty(); - $data['approve_check_status'] = $approve_data['check_status']; - return $data->toArray(); - } - public static function approve($params,$admin_id): bool{ - $data = FinanceReturnedMoney::where('id',$params['id'])->findOrEmpty(); - $approve_data = FlowApprove::where('id',$data['approve_id'])->findOrEmpty(); - if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){ - self::setError('当前内容存在审核信息,请勿重复提交'); - return false; - } - Db::startTrans(); - try { - $res = addApprove( - '回款计划', - $params['id'], - 'app\common\model\finance\FinanceReturnedMoney', - $params['path'], - $params['flow_id'], - $admin_id - ); - if($res){ - FinanceReturnedMoney::where('id',$params['id'])->update([ - 'approve_id' => $res, + namespace app\adminapi\logic\finance; + + + use app\common\logic\BaseLogic; + use app\common\model\auth\Admin; + use app\common\model\contract\Contract; + use app\common\model\custom\Custom; + use app\common\model\finance\FinanceReturnedMoney; + use app\common\model\oa\FlowApprove; + use app\common\model\project\Project; + use think\facade\Db; + + + /** + * FinanceReturnedMoney逻辑 + * Class FinanceReturnedMoneyLogic + * @package app\adminapi\logic\finance + */ + class FinanceReturnedMoneyLogic extends BaseLogic + { + + + /** + * @notes 添加 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/13 15:38 + */ + public static function add(array $params): bool + { + $contract = Contract::field('project_id')->where('id', $params['contract_id'])->findOrEmpty(); + Db::startTrans(); + try { + FinanceReturnedMoney::create([ + 'project_id' => $contract['project_id'], + 'contract_id' => $params['contract_id'], + 'return_date' => strtotime($params['return_date']), + 'period' => $params['period'], + 'amount' => $params['amount'], + 'return_duty_id' => $params['return_duty_id'], + 'remark' => $params['remark'] ?? '', + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, ]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; } - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - self::setError($e->getMessage()); - return false; } - } -} \ No newline at end of file + + + /** + * @notes 编辑 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/13 15:38 + */ + public static function edit(array $params): bool + { + $contract = Contract::field('project_id')->where('id', $params['contract_id'])->findOrEmpty(); + Db::startTrans(); + try { + FinanceReturnedMoney::where('id', $params['id'])->update([ + 'project_id' => $contract['project_id'], + 'contract_id' => $params['contract_id'], + 'return_date' => strtotime($params['return_date']), + 'period' => $params['period'], + 'amount' => $params['amount'], + 'return_duty_id' => $params['return_duty_id'], + 'remark' => $params['remark'] ?? '', + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + ]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/13 15:38 + */ + public static function delete(array $params): bool + { + return FinanceReturnedMoney::destroy($params['id']); + } + + + /** + * @notes 获取详情 + * @param $params + * @return array + * @author likeadmin + * @date 2023/12/13 15:38 + */ + public static function detail($params): array + { + $data = FinanceReturnedMoney::field('id,project_id,contract_id,return_date,period,amount,return_status,return_duty_id,remark,annex,approve_id')->findOrEmpty($params['id']); + $project = Project::field('custom_id,name,project_code')->where('id', $data['project_id'])->findOrEmpty(); + $custom = Custom::field('name')->where('id', $project['custom_id'])->findOrEmpty(); + $contract = Contract::field('contract_name,contract_code')->where('id', $data['contract_id'])->findOrEmpty(); + $return_duty = Admin::field('name')->where('id', $data['return_duty_id'])->findOrEmpty(); + $data['project_name'] = $project['name']; + $data['project_code'] = $project['project_code']; + $data['custom_name'] = $custom['name']; + $data['contract_name'] = $contract['contract_name']; + $data['contract_code'] = $contract['contract_code']; + $data['period_text'] = $data->period_text; + $data['return_status_text'] = $data->return_status_text; + $data['return_duty'] = $return_duty['name']; + $approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty(); + $data['approve_check_status'] = $approve_data['check_status']; + return $data->toArray(); + } + + public static function approve($params, $admin_id): bool + { + $data = FinanceReturnedMoney::where('id', $params['id'])->findOrEmpty(); + $approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty(); + if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) { + self::setError('当前内容存在审核信息,请勿重复提交'); + return false; + } + Db::startTrans(); + try { + $res = addApprove( + '回款计划', + $params['id'], + 'app\common\model\finance\FinanceReturnedMoney', + $params['path'], + $params['flow_id'], + $admin_id + ); + if ($res) { + FinanceReturnedMoney::where('id', $params['id'])->update([ + 'approve_id' => $res, + ]); + } + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + } \ No newline at end of file diff --git a/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php b/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php index ad9587788..eb7422ff4 100644 --- a/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php +++ b/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php @@ -11,176 +11,195 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\finance; - - -use app\common\model\bank\BankAccount; -use app\common\model\contract\Contract; -use app\common\model\custom\Custom; -use app\common\model\finance\FinanceReturnedMoney; -use app\common\model\finance\FinanceReturnedRecord; -use app\common\logic\BaseLogic; -use app\common\model\oa\FlowApprove; -use app\common\model\project\Project; -use think\facade\Db; - - -/** - * FinanceReturnedRecord逻辑 - * Class FinanceReturnedRecordLogic - * @package app\adminapi\logic\finance - */ -class FinanceReturnedRecordLogic extends BaseLogic -{ - - - /** - * @notes 添加 - * @param array $params - * @return bool - * @author likeadmin - * @date 2023/12/13 16:28 - */ - public static function add(array $params): bool - { - $contract = Contract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty(); - Db::startTrans(); - try { - FinanceReturnedRecord::create([ - 'project_id' => $contract['project_id'], - 'contract_id' => $params['contract_id'], - 'finance_returned_money_id' => $params['finance_returned_money_id'], - 'return_date' => strtotime($params['return_date']), - 'amount' => $params['amount'], - 'collection_type' => $params['collection_type'], - 'invoice_status' => $params['invoice_status'], - 'pay_type' => $params['pay_type'], - 'return_desc' => $params['return_desc'] ?? '', - 'receiver' => $params['receiver'] ?? '', - 'remark' => $params['remark'] ?? '', - 'annex' => $params['annex']? json_encode($params['annex']) : null, - 'bank_account_id' => $params['bank_account_id'], - ]); - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - self::setError($e->getMessage()); - return false; - } - } - - - /** - * @notes 编辑 - * @param array $params - * @return bool - * @author likeadmin - * @date 2023/12/13 16:28 - */ - public static function edit(array $params): bool - { - $contract = Contract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty(); - Db::startTrans(); - try { - FinanceReturnedRecord::where('id', $params['id'])->update([ - 'project_id' => $contract['project_id'], - 'contract_id' => $params['contract_id'], - 'finance_returned_money_id' => $params['finance_returned_money_id'], - 'return_date' => strtotime($params['return_date']), - 'amount' => $params['amount'], - 'collection_type' => $params['collection_type'], - 'invoice_status' => $params['invoice_status'], - 'pay_type' => $params['pay_type'], - 'return_desc' => $params['return_desc'] ?? '', - 'receiver' => $params['receiver'] ?? '', - 'remark' => $params['remark'] ?? '', - 'annex' => $params['annex']? json_encode($params['annex']) : null, - 'bank_account_id' => $params['bank_account_id'], - 'update_time' => time(), - ]); - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - self::setError($e->getMessage()); - return false; - } - } - - - /** - * @notes 删除 - * @param array $params - * @return bool - * @author likeadmin - * @date 2023/12/13 16:28 - */ - public static function delete(array $params): bool - { - return FinanceReturnedRecord::destroy($params['id']); - } - - - /** - * @notes 获取详情 - * @param $params - * @return array - * @author likeadmin - * @date 2023/12/13 16:28 - */ - public static function detail($params): array - { - $data = FinanceReturnedRecord::field('id,project_id,contract_id,finance_returned_money_id,return_date,amount,collection_type,invoice_status,pay_type,return_desc,receiver,remark,annex,bank_account_id,approve_id') - ->findOrEmpty($params['id']); - $project = Project::field('custom_id,name,project_code')->where('id',$data['project_id'])->findOrEmpty(); - $custom = Custom::field('name')->where('id',$project['custom_id'])->findOrEmpty(); - $contract = Contract::field('contract_name,contract_code')->where('id',$data['contract_id'])->findOrEmpty(); - $finance_returned_money = FinanceReturnedMoney::field('period')->where('id',$data['finance_returned_money_id'])->findOrEmpty(); - $data['project_name'] = $project['name']; - $data['project_code'] = $project['project_code']; - $data['custom_name'] = $custom['name']; - $data['contract_name'] = $contract['contract_name']; - $data['contract_code'] = $contract['contract_code']; - $data['period'] = $finance_returned_money->period_text; - $data['collection_type_text'] = $data->collection_type_text; - $data['invoice_status_text'] = $data->invoice_status_text; - $data['pay_type_text'] = $data->pay_type_text; - $data['bank_account_info'] = BankAccount::field('account_sn,deposit_bank,account_name,account')->where('id',$data['bank_account_id'])->findOrEmpty(); - $approve_data = FlowApprove::where('id',$data['approve_id'])->findOrEmpty(); - $data['approve_check_status'] = $approve_data['check_status']; - return $data->toArray(); - } - public static function approve($params,$admin_id): bool{ - $data = FinanceReturnedRecord::where('id',$params['id'])->findOrEmpty(); - $approve_data = FlowApprove::where('id',$data['approve_id'])->findOrEmpty(); - if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){ - self::setError('当前内容存在审核信息,请勿重复提交'); - return false; - } - Db::startTrans(); - try { - $res = addApprove( - '开票申请', - $params['id'], - 'app\common\model\finance\FinanceReturnedRecord', - $params['path'], - $params['flow_id'], - $admin_id - ); - if($res){ - FinanceReturnedRecord::where('id',$params['id'])->update([ - 'approve_id' => $res, - ]); + namespace app\adminapi\logic\finance; + + + use app\common\logic\BaseLogic; + use app\common\model\bank\BankAccount; + use app\common\model\contract\Contract; + use app\common\model\custom\Custom; + use app\common\model\finance\FinanceReturnedMoney; + use app\common\model\finance\FinanceReturnedRecord; + use app\common\model\oa\FlowApprove; + use app\common\model\project\Project; + use think\facade\Db; + + + /** + * FinanceReturnedRecord逻辑 + * Class FinanceReturnedRecordLogic + * @package app\adminapi\logic\finance + */ + class FinanceReturnedRecordLogic extends BaseLogic + { + + + /** + * @notes 添加 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/13 16:28 + */ + public static function add(array $params): bool + { + $contract = Contract::field('project_id')->where('id', $params['contract_id'])->findOrEmpty(); + 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 { + FinanceReturnedRecord::create([ + 'project_id' => $contract['project_id'], + 'contract_id' => $params['contract_id'], + 'finance_returned_money_id' => $params['finance_returned_money_id'], + 'return_date' => strtotime($params['return_date']), + 'amount' => $params['amount'], + 'collection_type' => $params['collection_type'], + 'invoice_status' => $params['invoice_status'], + 'pay_type' => $params['pay_type'], + 'return_desc' => $params['return_desc'] ?? '', + 'receiver' => $params['receiver'] ?? '', + 'remark' => $params['remark'] ?? '', + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + 'bank_account_id' => $params['bank_account_id'], + ]); + FinanceReturnedMoney::where('id', $params['finance_returned_money_id'])->update([ + 'return_status' => $status + ]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; } - Db::commit(); - return true; - } catch (\Exception $e) { - Db::rollback(); - self::setError($e->getMessage()); - return false; } - } -} \ No newline at end of file + + + /** + * @notes 编辑 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/13 16:28 + */ + public static function edit(array $params): bool + { + $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(); + try { + FinanceReturnedRecord::where('id', $params['id'])->update([ + 'project_id' => $contract['project_id'], + 'contract_id' => $params['contract_id'], + 'finance_returned_money_id' => $params['finance_returned_money_id'], + 'return_date' => strtotime($params['return_date']), + 'amount' => $params['amount'], + 'collection_type' => $params['collection_type'], + 'invoice_status' => $params['invoice_status'], + 'pay_type' => $params['pay_type'], + 'return_desc' => $params['return_desc'] ?? '', + 'receiver' => $params['receiver'] ?? '', + 'remark' => $params['remark'] ?? '', + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + 'bank_account_id' => $params['bank_account_id'], + 'update_time' => time(), + ]); + FinanceReturnedMoney::where('id', $params['finance_returned_money_id'])->update([ + 'return_status' => $status + ]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/13 16:28 + */ + public static function delete(array $params): bool + { + return FinanceReturnedRecord::destroy($params['id']); + } + + + /** + * @notes 获取详情 + * @param $params + * @return array + * @author likeadmin + * @date 2023/12/13 16:28 + */ + public static function detail($params): array + { + $data = FinanceReturnedRecord::field('id,project_id,contract_id,finance_returned_money_id,return_date,amount,collection_type,invoice_status,pay_type,return_desc,receiver,remark,annex,bank_account_id,approve_id') + ->findOrEmpty($params['id']); + $project = Project::field('custom_id,name,project_code')->where('id', $data['project_id'])->findOrEmpty(); + $custom = Custom::field('name')->where('id', $project['custom_id'])->findOrEmpty(); + $contract = Contract::field('contract_name,contract_code')->where('id', $data['contract_id'])->findOrEmpty(); + $finance_returned_money = FinanceReturnedMoney::field('period')->where('id', $data['finance_returned_money_id'])->findOrEmpty(); + $data['project_name'] = $project['name']; + $data['project_code'] = $project['project_code']; + $data['custom_name'] = $custom['name']; + $data['contract_name'] = $contract['contract_name']; + $data['contract_code'] = $contract['contract_code']; + $data['period'] = $finance_returned_money->period_text; + $data['collection_type_text'] = $data->collection_type_text; + $data['invoice_status_text'] = $data->invoice_status_text; + $data['pay_type_text'] = $data->pay_type_text; + $data['bank_account_info'] = BankAccount::field('account_sn,deposit_bank,account_name,account')->where('id', $data['bank_account_id'])->findOrEmpty(); + $approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty(); + $data['approve_check_status'] = $approve_data['check_status']; + return $data->toArray(); + } + + public static function approve($params, $admin_id): bool + { + $data = FinanceReturnedRecord::where('id', $params['id'])->findOrEmpty(); + $approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty(); + if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) { + self::setError('当前内容存在审核信息,请勿重复提交'); + return false; + } + Db::startTrans(); + try { + $res = addApprove( + '开票申请', + $params['id'], + 'app\common\model\finance\FinanceReturnedRecord', + $params['path'], + $params['flow_id'], + $admin_id + ); + if ($res) { + FinanceReturnedRecord::where('id', $params['id'])->update([ + 'approve_id' => $res, + ]); + } + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + } \ No newline at end of file