diff --git a/app/api/controller/Merchant.php b/app/api/controller/Merchant.php
index 85310271..c9f1c23c 100644
--- a/app/api/controller/Merchant.php
+++ b/app/api/controller/Merchant.php
@@ -77,6 +77,13 @@ class Merchant extends Controller
 
     }
 
+    public function detail(int $merchantId): Json
+    {
+        // 获取商品详情
+        $detail = MerchantModel::detail($merchantId);
+        return $this->renderSuccess(compact('detail'));
+    }
+
     /**
      * 更新商城信息
      * @return Json
diff --git a/app/store/controller/Order.php b/app/store/controller/Order.php
index e3bad995..29515f33 100644
--- a/app/store/controller/Order.php
+++ b/app/store/controller/Order.php
@@ -32,7 +32,7 @@ class Order extends Controller
         // 订单列表
         $model = new OrderModel;
         $params = $this->request->param();
-        $params['merchant_id'] = $this->merchantId;
+        $params['merchantId'] = $this->merchantId;
         $result = $model->getList($params);
         $data = $result->items();
         if (!empty($data)) {