From 8343f42049d2d84d3e7dd1ff920130e855d71008 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Tue, 19 Dec 2023 15:44:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=20=E5=90=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/dataview/Merchant.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controller/api/dataview/Merchant.php b/app/controller/api/dataview/Merchant.php
index 94dda2e2..3052667f 100644
--- a/app/controller/api/dataview/Merchant.php
+++ b/app/controller/api/dataview/Merchant.php
@@ -136,7 +136,7 @@ class Merchant extends BaseController
 //        }, 2000 + random_int(600, 1200));
         $list =  StoreOrderProduct::getDB()->alias('A')->leftJoin('StoreOrder B', 'A.order_id = B.order_id')
             ->field(\think\facade\Db::raw('sum(A.product_num) as total,A.product_id,cart_info'))
-            ->whereBetweenTime('B.pay_time', $startDate, $endDate)
+            ->whereBetweenTime('B.pay_time', $startDate, date("Y-m-d H:i:s", $endDate))
             ->where('B.mer_id', $merId)
             ->where('B.paid', 1)->group('A.product_id')->limit(30)->order('total DESC')->fetchSql()->select();
         $totalCount = 0;