From 3db2bda60761fe23a30e2178d52b23d1e8474f0e Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 21 Jun 2024 17:27:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E8=BD=AC=E8=B4=A6=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E4=BB=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=95=88=E7=8E=87=E5=92=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinancialTransfersController.php | 9 +----- .../FinancialTransfersLists.php | 7 +++-- .../StoreCashFinanceFlowLists.php | 2 +- .../FinancialTransfersLogic.php | 30 ++++++++++--------- app/common/logic/CashFlowLogic.php | 1 + 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/app/admin/controller/financial_transfers/FinancialTransfersController.php b/app/admin/controller/financial_transfers/FinancialTransfersController.php index 9f98930d8..7d9b75f8c 100644 --- a/app/admin/controller/financial_transfers/FinancialTransfersController.php +++ b/app/admin/controller/financial_transfers/FinancialTransfersController.php @@ -10,7 +10,7 @@ use app\admin\validate\financial_transfers\FinancialTransfersValidate; /** - * FinancialTransfers控制器 + * 财务转账控制器 * Class FinancialTransfersController * @package app\admin\controller\financial_transfers */ @@ -64,13 +64,6 @@ class FinancialTransfersController extends BaseAdminController } - - - - - - - /** * @notes 添加 * @return \think\response\Json diff --git a/app/admin/lists/financial_transfers/FinancialTransfersLists.php b/app/admin/lists/financial_transfers/FinancialTransfersLists.php index 8c989e285..6703d363d 100644 --- a/app/admin/lists/financial_transfers/FinancialTransfersLists.php +++ b/app/admin/lists/financial_transfers/FinancialTransfersLists.php @@ -6,10 +6,10 @@ namespace app\admin\lists\financial_transfers; use app\admin\lists\BaseAdminDataLists; use app\common\model\financial_transfers\FinancialTransfers; use app\common\lists\ListsSearchInterface; - +use app\common\model\store_cash_finance_flow\StoreCashFinanceFlow; /** - * FinancialTransfers列表 + * 财务转账列表 * Class FinancialTransfersLists * @package app\admin\listsfinancial_transfers */ @@ -50,6 +50,9 @@ class FinancialTransfersLists extends BaseAdminDataLists implements ListsSearchI ->toArray(); foreach ($data as &$value){ if($value['initiation_time']){ + $time=strtotime('-1 month',$value['initiation_time']); + $date=date('Y-m-d',$time);//获取一个月前的日期 + $value['receivable']=StoreCashFinanceFlow::whereMonth('create_time',$date)->where('status',0)->sum('receivable'); $value['initiation_time'] = date('Y-m-d H:i:s',$value['initiation_time']); } diff --git a/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php b/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php index e4c25f5ad..4feb8ccd7 100644 --- a/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php +++ b/app/admin/lists/store_cash_finance_flow/StoreCashFinanceFlowLists.php @@ -27,7 +27,7 @@ class StoreCashFinanceFlowLists extends BaseAdminDataLists implements ListsSearc public function setSearch(): array { return [ - '=' => ['store_id'], + '=' => ['store_id','status'], "between_time" => 'create_time' ]; } diff --git a/app/admin/logic/financial_transfers/FinancialTransfersLogic.php b/app/admin/logic/financial_transfers/FinancialTransfersLogic.php index 8a571e70e..d9b0577b3 100644 --- a/app/admin/logic/financial_transfers/FinancialTransfersLogic.php +++ b/app/admin/logic/financial_transfers/FinancialTransfersLogic.php @@ -5,6 +5,7 @@ namespace app\admin\logic\financial_transfers; use app\common\model\financial_transfers\FinancialTransfers; use app\common\logic\BaseLogic; +use app\common\model\store_cash_finance_flow\StoreCashFinanceFlow; use think\facade\Db; @@ -112,45 +113,46 @@ class FinancialTransfersLogic extends BaseLogic { Db::startTrans(); try { - FinancialTransfers::where('id',$params['id']) + FinancialTransfers::where('id', $params['id']) ->update( [ - 'status'=>1, - 'initiation_time'=>time() + 'status' => 1, + 'initiation_time' => time() ] ); Db::commit(); return true; - }catch (\Exception $e) { + } catch (\Exception $e) { Db::rollback(); self::setError($e->getMessage()); return false; } - - } - public static function dealchange($params,$id) + public static function dealchange($params, $id) { + $find = FinancialTransfers::where('id', $id)->find(); + $time = strtotime('-1 month', $find['initiation_time']); + $date = date('Y-m-d', $time); //获取一个月前的日期 + $receivable = StoreCashFinanceFlow::whereMonth('create_time', $date)->where('status', 0)->sum('receivable'); + if($receivable==0){ + self::setError('暂无法确认,还有未收取的现金'); + } Db::startTrans(); try { - FinancialTransfers::where('id',$id) + FinancialTransfers::where('id', $id) ->update( $params ); Db::commit(); return true; - }catch (\Exception $e) { + } catch (\Exception $e) { Db::rollback(); self::setError($e->getMessage()); return false; } - - } - - -} \ No newline at end of file +} diff --git a/app/common/logic/CashFlowLogic.php b/app/common/logic/CashFlowLogic.php index 9b0e3c728..3c15d154e 100644 --- a/app/common/logic/CashFlowLogic.php +++ b/app/common/logic/CashFlowLogic.php @@ -20,6 +20,7 @@ class CashFlowLogic extends BaseLogic $model->store_id = $storeId; $model->cash_price = $amount; $model->receivable = $amount; + $model->remark = '银行转账请备注:'.mt_rand(1000, 9999); $model->status = YesNoEnum::NO; //收银台收了默认算完成了 $model->save(); }