trace

app/store/controller/Order.php

@@ -31,7 +31,9 @@ class Order extends Controller
     {
         // 订单列表
         $model = new OrderModel;
-        $result = $model->getList($this->request->param());
+        $params = $this->request->param();
+        $params['merchant_id'] = $this->merchantId;
+        $result = $model->getList($params);
         $data = $result->items();
         if (!empty($data)) {
             foreach ($data as $key => $value) {

app/store/controller/setting/Payment.php

@@ -22,7 +22,6 @@ class Payment extends Controller
      */
     public function options(): Json
     {
-        $this->merchantId = $this->request->param("merchantId");
         $options = PaymentModel::getAll($this->storeId, $this->merchantId);
         return $this->renderSuccess(compact('options'));
     }