From 87c79b1ae6c216286f672d3f00f51f99ced6ab17 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Sat, 23 Sep 2023 16:00:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=87=E7=AE=A1=E7=90=86=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/CompanyController.php | 4 ++--
 app/common/logic/task/TaskLogic.php      | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php
index 2f297309a..151bf7390 100644
--- a/app/api/controller/CompanyController.php
+++ b/app/api/controller/CompanyController.php
@@ -298,7 +298,7 @@ class CompanyController extends BaseApiController
 
             // 小组服务公司股金变动 + 公司股金减少记录
             $leftAmount = bcsub($serviceGroupCompany['shareholder_money'], $amount, 2);
-            Company::where('id', $this->userInfo['company_id'])->save('shareholder_money', $leftAmount);
+            Company::where('id', $this->userInfo['company_id'])->save(['shareholder_money'=> $leftAmount]);
             $company_log1 = [
                 'sn' => generate_sn(UserAccountLog::class, 'sn', 20),
                 'company_id' => $serviceGroupCompany['id'],
@@ -314,7 +314,7 @@ class CompanyController extends BaseApiController
 
             // 村管理公司股金变动 + 公司股金增加记录
             $addAmount = bcadd($villageCompany['shareholder_money'], $amount, 2);
-            Company::where('id', $villageCompany['id'])->save('shareholder_money', $addAmount);
+            Company::where('id', $villageCompany['id'])->save(['shareholder_money'=>$addAmount]);
 
             // 公司账户变动记录
             $company_log2 = [
diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php
index 5f80b2ccf..ae4cf1818 100644
--- a/app/common/logic/task/TaskLogic.php
+++ b/app/common/logic/task/TaskLogic.php
@@ -568,6 +568,7 @@ class TaskLogic extends BaseLogic
             if ($contractCount < 15) {
                 // 关闭任务，并且没有奖励
                 (new Task())->closeTask($taskSchedulePlan['task_id']);
+                Log::info('结算失败：' . $taskTemplateInfo['title'] . '第二阶段未完成。任务：' . json_encode($task));
                 return false;
             }