1

app/Http/Controllers/Admin/AdminUserMerchantController.php

@@ -204,7 +204,7 @@ class AdminUserMerchantController extends AdminBaseController
                 $model->where('id', $request->id);
             }
             $data = $model->first();
-            $data['mch_list'] = AdminMerchant::query()->where(AdminMerchant::putMerchantId())->get(['id', 'name']);
+            $data['mch_list'] = AdminMerchant::query()->where(AdminMerchant::getMerchantWhere())->get(['id', 'name']);
         } elseif (Admin::user()->isRole(AdminRole::MERCHANTSADMIN)) {
             $data = AdminMerchant::query()->where('admin_id', $admin_id)->first();
             $data['mch_list'] = AdminMerchant::query()->where('id',AdminMerchant::putMerchantId())->get(['id', 'name']);

app/Http/Controllers/Admin/OrderController.php

@@ -677,14 +677,17 @@ class OrderController extends Controller
     public function getOrdersByNo(Request $request)
     {
         $no = $request->get('no') ?? '';
-        if (!empty($no)) {
-            $order = Order::query()->where('no', $no)->with(['users', 'bikes'])->first();
+
+        if (empty($no)) {
+            return $this->error('填充订单号不能为空');
+        }
+        $order = Order::query()->where('no', $no)->with(['users', 'bikes'])->first();
+        if (empty($order)) {
+            $order = OrderRent::query()->where('no', $no)->with(['users', 'bikes'])->first();
             if (empty($order)) {
-                $order = OrderRent::query()->where('no', $no)->with(['users', 'bikes'])->first();
-                if (empty($order)) {
-                    return $this->error('找不到此订单号对应得订单');
-                }
+                return $this->error('找不到此订单号对应得订单');
             }
+
         }
         return $this->ok($order->toArray());
     }