添加：商户订单相关接口 - 部分接口添加分销判断

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'])

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));
     }
 
     /**

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)