From 2c95c0b8e34eb791f743ffbafc2e3963918edf13 Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Sat, 9 Sep 2023 22:00:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/TaskController.php | 2 ++
 app/common/logic/task/TaskLogic.php   | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index a3ed2ffb6..dc971ece8 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -93,9 +93,11 @@ class TaskController extends BaseApiController
         $parmas['start_time']=date('Y-m-d',$task['start_time']);
         $parmas['end_time']=$task['end_time'].' 23:59:59';
         $list = App(RemoteController::class)->shang_date_list($company, 1, $parmas);
+        $shang_date_total_price = App(RemoteController::class)->shang_date_total_price($company,$parmas);
         if ($task != false) {
             $find['list'] = $list;
             $find['extend']=$task['extend'];
+            $find['extend']['transaction']['arr']['total_price']=$shang_date_total_price['arr']['total_price']??0;
             if($transaction_pool==0){
                 $find['transaction_pool']=0;
             }else{
diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php
index 2bcac52da..5edb7cf13 100644
--- a/app/common/logic/task/TaskLogic.php
+++ b/app/common/logic/task/TaskLogic.php
@@ -74,7 +74,6 @@ class TaskLogic extends BaseLogic
     public static function CronAdd(array $v, $datas): bool
     {
         try {
-            $v['day_count']=$v['day_count']+1;
             if ($v['types'] == 3) {
                 $task = Task::where('template_id', $v['id'])->find();
                 if ($task) {