From 0cd828f3da54eaea0d5689a2c8b1d86bde392896 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 28 Dec 2023 14:36:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8A=BC=E9=87=91=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/server/StoreOrder.php | 12 ++++++++++++
 route/api.php                            |  1 +
 2 files changed, 13 insertions(+)

diff --git a/app/controller/api/server/StoreOrder.php b/app/controller/api/server/StoreOrder.php
index 49fb89e8..571d5182 100644
--- a/app/controller/api/server/StoreOrder.php
+++ b/app/controller/api/server/StoreOrder.php
@@ -405,4 +405,16 @@ class StoreOrder extends BaseController
         return app('json')->success($list);
     }
 
+    
+    /**
+     * 获取商户押金列表
+     */
+    public function getOrderAutoMarginList($merId){
+        [$page, $limit] = $this->getPage();
+       $select= Db::name('financial_record')->where('mer_id',$merId)->where('type',1)
+        ->where('financial_type','auto_margin')->where('financial_pm',0)
+        ->page($page)->limit($limit)->order('financial_record_id','desc')->select();
+        return app('json')->success($select);
+
+    }
 }
diff --git a/route/api.php b/route/api.php
index db68d84b..e4d5b088 100644
--- a/route/api.php
+++ b/route/api.php
@@ -340,6 +340,7 @@ Route::group('api/', function () {
         //管理员订单
         Route::group('admin/:merId', function () {
             Route::get('/statistics', '/orderStatistics');
+            Route::get('/auto_margin', '/getOrderAutoMarginList');
             Route::get('/order_price', '/orderDetail');
             Route::get('/order_list', '/orderList');
             Route::get('/order/:id', '/order');