diff --git a/app/adminapi/controller/finance/FinanceReturnedRecordController.php b/app/adminapi/controller/finance/FinanceReturnedRecordController.php new file mode 100644 index 000000000..aff99fe09 --- /dev/null +++ b/app/adminapi/controller/finance/FinanceReturnedRecordController.php @@ -0,0 +1,108 @@ +dataLists(new FinanceReturnedRecordLists()); + } + + + /** + * @notes 添加 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/13 16:28 + */ + public function add() + { + $params = (new FinanceReturnedRecordValidate())->post()->goCheck('add'); + $result = FinanceReturnedRecordLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(FinanceReturnedRecordLogic::getError()); + } + + + /** + * @notes 编辑 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/13 16:28 + */ + public function edit() + { + $params = (new FinanceReturnedRecordValidate())->post()->goCheck('edit'); + $result = FinanceReturnedRecordLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(FinanceReturnedRecordLogic::getError()); + } + + + /** + * @notes 删除 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/13 16:28 + */ + public function delete() + { + $params = (new FinanceReturnedRecordValidate())->post()->goCheck('delete'); + FinanceReturnedRecordLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取详情 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/13 16:28 + */ + public function detail() + { + $params = (new FinanceReturnedRecordValidate())->goCheck('detail'); + $result = FinanceReturnedRecordLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php b/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php index 2448c2f99..398a7df37 100644 --- a/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php +++ b/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php @@ -71,10 +71,7 @@ class FinanceInvoiceApplyLists extends BaseAdminDataLists implements ListsSearch */ public function count(): int { - $financeInvoiceApply = FinanceInvoiceApply::findOrEmpty($params['id']); - $financeInvoiceApply->project = $financeInvoiceApply->project; - $financeInvoiceApply->custom = $financeInvoiceApply->custom; - return $financeInvoiceApply->toArray(); + return FinanceInvoiceApply::where($this->searchWhere)->count(); } } \ No newline at end of file diff --git a/app/adminapi/lists/finance/FinanceReturnedRecordLists.php b/app/adminapi/lists/finance/FinanceReturnedRecordLists.php new file mode 100644 index 000000000..2abd468ee --- /dev/null +++ b/app/adminapi/lists/finance/FinanceReturnedRecordLists.php @@ -0,0 +1,77 @@ + ['customer_id', 'contract_id', 'finance_returned_money_id'], + ]; + } + + + /** + * @notes 获取列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2023/12/13 16:28 + */ + public function lists(): array + { + return FinanceReturnedRecord::where($this->searchWhere) + ->field(['*']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取数量 + * @return int + * @author likeadmin + * @date 2023/12/13 16:28 + */ + public function count(): int + { + return FinanceReturnedRecord::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php b/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php new file mode 100644 index 000000000..c641063dd --- /dev/null +++ b/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php @@ -0,0 +1,142 @@ + $params['customer_id'], + 'contract_id' => $params['contract_id'], + 'finance_returned_money_id' => $params['finance_returned_money_id'], + 'return_date' => $params['return_date'], + 'period' => $params['period'], + 'amount' => $params['amount'], + 'collection_type' => $params['collection_type'], + 'invoice_status' => $params['invoice_status'], + 'pay_type' => $params['pay_type'], + 'return_total_amount' => $params['return_total_amount'], + 'return_desc' => $params['return_desc'], + 'receiver' => $params['receiver'], + 'payee_id' => $params['payee_id'], + 'is_interest' => $params['is_interest'], + 'interest_date' => $params['interest_date'], + 'remark' => $params['remark'], + 'annex' => $params['annex'], + ]); + + 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 + { + Db::startTrans(); + try { + FinanceReturnedRecord::where('id', $params['id'])->update([ + 'customer_id' => $params['customer_id'], + 'contract_id' => $params['contract_id'], + 'finance_returned_money_id' => $params['finance_returned_money_id'], + 'return_date' => $params['return_date'], + 'period' => $params['period'], + 'amount' => $params['amount'], + 'collection_type' => $params['collection_type'], + 'invoice_status' => $params['invoice_status'], + 'pay_type' => $params['pay_type'], + 'return_total_amount' => $params['return_total_amount'], + 'return_desc' => $params['return_desc'], + 'receiver' => $params['receiver'], + 'payee_id' => $params['payee_id'], + 'is_interest' => $params['is_interest'], + 'interest_date' => $params['interest_date'], + 'remark' => $params['remark'], + 'annex' => $params['annex'], + ]); + + 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 + { + $financeReturnedRecord = FinanceReturnedRecord::findOrEmpty($params['id']); + $financeReturnedRecord->contract = $financeReturnedRecord->contract; + $financeReturnedRecord->custom = $financeReturnedRecord->custom; + $financeReturnedRecord->plan = $financeReturnedRecord->returnedPlan; + return $financeReturnedRecord->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/validate/finance/FinanceReturnedRecordValidate.php b/app/adminapi/validate/finance/FinanceReturnedRecordValidate.php new file mode 100644 index 000000000..401a7d760 --- /dev/null +++ b/app/adminapi/validate/finance/FinanceReturnedRecordValidate.php @@ -0,0 +1,97 @@ + 'require', + 'customer_id' => 'require', + 'contract_id' => 'require', + 'finance_returned_money_id' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + ]; + + + /** + * @notes 添加场景 + * @return FinanceReturnedRecordValidate + * @author likeadmin + * @date 2023/12/13 16:28 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return FinanceReturnedRecordValidate + * @author likeadmin + * @date 2023/12/13 16:28 + */ + public function sceneEdit() + { + return $this->only(['id', 'customer_id', 'contract_id', 'finance_returned_money_id']); + } + + + /** + * @notes 删除场景 + * @return FinanceReturnedRecordValidate + * @author likeadmin + * @date 2023/12/13 16:28 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return FinanceReturnedRecordValidate + * @author likeadmin + * @date 2023/12/13 16:28 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/common/model/finance/FinanceReturnedRecord.php b/app/common/model/finance/FinanceReturnedRecord.php new file mode 100644 index 000000000..6db7b7d8a --- /dev/null +++ b/app/common/model/finance/FinanceReturnedRecord.php @@ -0,0 +1,48 @@ +belongsTo(\app\common\model\custom\Custom::class, 'customer_id'); + } + + public function contract() + { + return $this->belongsTo(\app\common\model\contract\Contract::class, 'contract_id'); + } + + public function returnedPlan() + { + return $this->belongsTo(\app\common\model\finance\FinanceReturnedMoney::class, 'finance_returned_money_id'); + } + +} \ No newline at end of file