From 9ed74f26cfa1f10062ffa5c26432240ef54a8477 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 13 Jan 2025 10:38:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(cash=5Fflow):=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=B5=84=E9=87=91=E6=B5=81=E6=B0=B4=E6=8F=92=E5=85=A5=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 CashFlowLogic 类的 insert 方法中添加 source_mark 参数，用于记录资金来源标记
- 在 PayNotifyLogic 类中，订单支付成功后调用 CashFlowLogic 的 insert 方法，传入订单编号作为 source_mark
- 这些修改增加了资金流水记录的详细信息，有助于后续的财务对账和分析
---
 app/common/logic/CashFlowLogic.php  | 3 ++-
 app/common/logic/PayNotifyLogic.php | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/common/logic/CashFlowLogic.php b/app/common/logic/CashFlowLogic.php
index 3c15d154e..f4daff58d 100644
--- a/app/common/logic/CashFlowLogic.php
+++ b/app/common/logic/CashFlowLogic.php
@@ -8,7 +8,7 @@ use app\common\model\store_cash_finance_flow\StoreCashFinanceFlow;
 class CashFlowLogic extends BaseLogic
 {
 
-    public function insert($storeId, $amount)
+    public function insert($storeId, $amount,$source_mark='')
     {
         $model = new StoreCashFinanceFlow();
         $find = $model->where(['store_id' => $storeId])->whereDay('create_time')->where('status', 0)->find();
@@ -21,6 +21,7 @@ class CashFlowLogic extends BaseLogic
             $model->cash_price = $amount;
             $model->receivable = $amount;
             $model->remark = '银行转账请备注:'.mt_rand(1000, 9999);
+            $model->source_mark = $source_mark;
             $model->status = YesNoEnum::NO; //收银台收了默认算完成了
             $model->save();
         }
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index dd60215b9..b835ae9fa 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -495,6 +495,8 @@ class PayNotifyLogic extends BaseLogic
         if ($order['other_uid'] > 0) {
             $uid = $order['other_uid'];
         }
+        $cashFlowLogic = new CashFlowLogic();
+        $cashFlowLogic->insert($order['store_id'], $order['price'],$orderSn);
 
         PushService::push('wechat_mmp_' . $uid, $uid, ['type' => 'INDUSTRYMEMBERS', 'msg' => '订单支付成功', 'data' => ['id' => $order['id'], 'paid' => 1]]);
         PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'INDUSTRYMEMBERS', 'msg' => '订单支付成功', 'data' => ['id' => $order['id'], 'paid' => 1]]);