From c4b518e85efaed9caf7ac607e18217dfeb717f8b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 11 Sep 2023 13:42:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/TaskController.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index 3887822cc..d018544b3 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -86,6 +86,7 @@ class TaskController extends BaseApiController
         if(!$task){
             return $this->fail('任务不存在');
         }
+        $task=$task->toArray();
         $transaction_pool=TaskTemplate::where('id',$task['template_id'])->value('transaction_pool');
 
         $company = Company::where('id', $task['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade,responsible_area')->find(); // 可能要判断预存金是否满足
@@ -95,12 +96,12 @@ class TaskController extends BaseApiController
         $list = App(RemoteController::class)->shang_date_list($company, 1, $parmas);
         if ($task != false) {
             $find['list'] = $list;
-            $find['extend']=$task['extend'];
             if($transaction_pool==0){
-                $find['arr']['transaction_pool']=0;
+                $task['extend']['transaction']['arr']['transaction_pool']=0;
             }else{
-                $find['arr']['transaction_pool']=$transaction_pool;
+                $task['extend']['transaction']['arr']['transaction_pool']=$transaction_pool;
             }
+            $find['extend']=$task['extend'];
             return $this->success('ok', $find);
         }
         return $this->success('ok');