From 8d56c24155246b254519156ecfdd3a425f9f5d4f Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 16 Aug 2023 13:32:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/lists/AccountLogLists.php | 10 +++++-----
 app/job/TaskInformationJob.php    |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/api/lists/AccountLogLists.php b/app/api/lists/AccountLogLists.php
index b4047bf3b..cb4154e84 100755
--- a/app/api/lists/AccountLogLists.php
+++ b/app/api/lists/AccountLogLists.php
@@ -53,9 +53,9 @@ class AccountLogLists extends BaseApiDataLists
         // 变动时间
         if (!empty($this->params['time'])) {
             $date = strtotime($this->params['time']);
-            $startTime = $date - 3600; // 获取该日期零点的时间戳
-            $endTime = $date + 86400; // 获取该日期24小时后的时间戳
-            $where[] = ['create_time', 'between time', [$startTime, $endTime]];
+            $startTime = $date; // 获取该日期零点的时间戳
+            $endTime = $date + 86399; // 获取该日期24小时后的时间戳
+            $where[] = ['create_time', 'between', [$startTime, $endTime]];
         }
         return $where;
     }
@@ -113,9 +113,9 @@ class AccountLogLists extends BaseApiDataLists
             $date = strtotime($this->params['time']);
             $startTime = $date; // 获取该日期零点的时间戳
             $endTime = $date + 86399; // 获取该日期24小时后的时间戳
-            $where[] = ['create_time', 'between time', [$startTime, $endTime]];
+            $where[] = ['create_time', 'between', [$startTime, $endTime]];
         }else{
-            $where[] = ['create_time', 'between time', [strtotime(date('Y-m-d')), strtotime(date('Y-m-d'))+86366]];
+            $where[] = ['create_time', 'between', [strtotime(date('Y-m-d')), strtotime(date('Y-m-d'))+86366]];
         }
         $lists = UserAccountLog::field($field)
             ->where($where)
diff --git a/app/job/TaskInformationJob.php b/app/job/TaskInformationJob.php
index e39f6d0d1..411bd09f8 100644
--- a/app/job/TaskInformationJob.php
+++ b/app/job/TaskInformationJob.php
@@ -76,6 +76,8 @@ class TaskInformationJob
                 $name = '片区交易';
                 if ($json['status'] == 200) {
                     $arr['total_price'] = $json['data']['total_price'];
+                    //基础金额*(每日基户数*天数)//且户数小于公司总户数
+                    // $day=date('d',time())>;
                     if ($json['data']['total_price'] > 58*5) {
                         $arr['status'] = 1;
                         $name = '片区交易';