From 0fb79059ba3184399980381adbd236dbb85c2d8f Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 13 Mar 2024 14:24:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/server/StoreOrder.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/controller/api/server/StoreOrder.php b/app/controller/api/server/StoreOrder.php
index 6f9049a9..026c4921 100644
--- a/app/controller/api/server/StoreOrder.php
+++ b/app/controller/api/server/StoreOrder.php
@@ -68,6 +68,11 @@ class StoreOrder extends BaseController
         [$page, $limit] = $this->getPage();
         $where['section_startTime'] =  $this->request->param('section_startTime');
         $where['section_endTime'] =  $this->request->param('section_endTime');
+        if(empty($where['section_startTime']) && empty($where['section_endTime'])){
+            $where['section_startTime'] = date('Y-m-d',time()).' 00:00:00';
+            $where['section_endTime'] = date('Y-m-d',time()).' 23:59:59';
+        }
+
         return app('json')->success($repository->revenueExpenditure($where, $page, $limit,$merId));
     }
 

From c5dfa55a94461a0e75947cc855fb1350c8b1f700 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 13 Mar 2024 14:38:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 route/api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/route/api.php b/route/api.php
index 836b653e..57416a5b 100644
--- a/route/api.php
+++ b/route/api.php
@@ -244,6 +244,7 @@ Route::group('api/', function () {
         Route::post('intention/update/:id', 'api.store.merchant.MerchantIntention/update');
         Route::post('store/product/group/cancel', 'api.store.product.StoreProductGroup/cancel');
 
+        Route::get('admin/:merId/expenditure', 'api.server.StoreOrder/expenditure');//商户账单
         //客服商品管理
         Route::group('server/:merId', function () {
             //商品
@@ -290,7 +291,6 @@ Route::group('api/', function () {
 
         //管理员订单
         Route::group('admin/:merId', function () {
-            Route::get('/expenditure', '/expenditure');
             Route::get('/statistics', '/orderStatistics');
             Route::get('/order_price', '/orderDetail');
             Route::get('/order_list', '/orderList');