From 381dd697150975d8c97adc491f7c5cb24a25fe10 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 16 Nov 2023 14:20:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=20-=20?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E9=94=80=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreOrderRepository.php  |  3 +++
 app/controller/merchant/store/order/Order.php          |  6 +++++-
 route/merchant/config.php                              | 10 ----------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 1dbfaaf..57a8b4a 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -1565,6 +1565,9 @@ class StoreOrderRepository extends BaseRepository
                 'spread' => function ($query) {
                     $query->field('uid,nickname,avatar');
                 },
+                'user' => function ($query) {
+                    $query->field('uid,nickname,avatar');
+                },
             ]);
         $count = $query->count();
         $list = $query->page($page, $limit)->select()->append(['refund_extension_one', 'refund_extension_two'])
diff --git a/app/controller/merchant/store/order/Order.php b/app/controller/merchant/store/order/Order.php
index 55c3277..01cb6b5 100644
--- a/app/controller/merchant/store/order/Order.php
+++ b/app/controller/merchant/store/order/Order.php
@@ -46,6 +46,7 @@ class Order extends BaseController
         [$page, $limit] = $this->getPage();
         $where = $this->request->params(['status', 'date', 'order_sn', 'username', 'order_type', 'keywords', 'order_id', 'activity_type', 'group_order_sn', 'store_name','filter_delivery','filter_product']);
         $where['mer_id'] = $this->request->merId();
+        $where['is_spread'] = $this->request->param('is_spread',0);
         $pay_type = $this->request->param('pay_type','');
         if ($pay_type != '') $where['pay_type'] = $this->repository::PAY_TYPE_FILTEER[$pay_type];
         return app('json')->success($this->repository->merchantGetList($where, $page, $limit));
@@ -87,7 +88,10 @@ class Order extends BaseController
      */
     public function chart()
     {
-        return app('json')->success($this->repository->OrderTitleNumber($this->request->merId(), null));
+        $isSpread = (int)$this->request->param('is_spread',0);
+        $orderType = null;
+        if($isSpread > 0) $orderType = (int)2;
+        return app('json')->success($this->repository->OrderTitleNumber($this->request->merId(), $orderType));
     }
 
     /**
diff --git a/route/merchant/config.php b/route/merchant/config.php
index 23fc612..1bf963f 100644
--- a/route/merchant/config.php
+++ b/route/merchant/config.php
@@ -30,22 +30,12 @@ Route::group(function () {
         Route::get('set_config', '/setMerConfig')->name('merchantPromoterConfigSet')->option([
             '_alias' => '编辑配置',
         ]);
-
-
-
-
-
     })->prefix('admin.system.config.ConfigOthers')->option([
         '_path' => '/get_config',
         '_auth' => true,
     ]);
 
 
-
-
-
-
-
 })->middleware(AllowOriginMiddleware::class)
     ->middleware(MerchantTokenMiddleware::class, true)
     ->middleware(MerchantAuthMiddleware::class)