From 8d15c136f27dbc13c8ac5bdfbcc9e29b54672226 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Fri, 22 Dec 2023 18:55:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=9C=8D=E5=8A=A1=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E4=BB=BB=E5=8A=A1=E6=94=B6=E7=9B=8A=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0remark?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/finance/ShareProfit.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/common/logic/finance/ShareProfit.php b/app/common/logic/finance/ShareProfit.php
index a08b9edec..de1221eee 100644
--- a/app/common/logic/finance/ShareProfit.php
+++ b/app/common/logic/finance/ShareProfit.php
@@ -52,15 +52,15 @@ class ShareProfit
             //公司
             if ($data['company_account_type'] == 1) {
                 $deposit_count = bcadd($company['deposit'], $master_maoney, 2);
-                $this->AccountLog($data['company_id'], $deposit_count, $master_maoney);
+                $this->AccountLog($data['company_id'], $deposit_count, $master_maoney,1,1,1, $data['msg']);
 
                 $company_money_count = bcadd($company['company_money'], $master_maoney, 2);
-                $this->AccountLog($data['company_id'], $company_money_count, $master_maoney);
+                $this->AccountLog($data['company_id'], $company_money_count, $master_maoney, 1, 1,1, $data['msg']);
 
                 Company::where('id', $data['company_id'])->update(['deposit' => Db::raw('deposit+' . $master_maoney), 'company_money' => Db::raw('company_money+' . $master_maoney)]);
             } elseif ($data['company_account_type'] == 2) {
                 $company_money_count = bcadd($company['shareholder_money'], $data['money'], 2);
-                $this->AccountLog($data['company_id'], $company_money_count, $data['money'], 1, 2);
+                $this->AccountLog($data['company_id'], $company_money_count, $data['money'], 1, 2, 1, $data['msg']);
                 Company::where('id', $data['company_id'])->update([
                     'deposit' => Db::raw('deposit+' . $master_maoney),
                     'company_money' => Db::raw('company_money+' . $master_maoney),
@@ -105,7 +105,7 @@ class ShareProfit
         }
     }
 
-    public function AccountLog($companyId, $left_amount, $changeAmount, $change_object = 1, $change_type = 1, $action = 1)
+    public function AccountLog($companyId, $left_amount, $changeAmount, $change_object = 1, $change_type = 1, $action = 1, $remark='')
     {
         $company_log = [
             'sn' => generate_sn(UserAccountLog::class, 'sn', 20),
@@ -115,6 +115,7 @@ class ShareProfit
             'action' => $action, //1-增加 2-减少
             'left_amount' => $left_amount, //变动后数量
             'change_amount' => $changeAmount, //变动数量
+            'remark' => $remark, //变动数量
             'status' => 1,
         ];
         CompanyAccountLog::create($company_log);