From 6aae1d7d2e664d0de0306b0a1ec781e349752e5d Mon Sep 17 00:00:00 2001 From: wuKong Date: Mon, 10 Nov 2025 14:01:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(order):=20=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85path?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 getOrderDetailByPayOrderNo 方法用于获取微信场景下的订单详情 - 在订单详情页面中，针对微信场景调用新接口 - 接口路径适配微信小程序商品订单详情配置要求 --- pages/order/detail.vue | 2 +- sheep/api/trade/order.js | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pages/order/detail.vue b/pages/order/detail.vue index f6aad236..635d18ba 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -405,7 +405,7 @@ let res; if (state.comeinType === 'wechat') { // TODO 芋艿：【微信物流】微信场景下 - res = await OrderApi.getOrderDetail(id, { + res = await OrderApi.getOrderDetailByPayOrderNo(id, { merchant_trade_no: state.merchantTradeNo, }); } else { diff --git a/sheep/api/trade/order.js b/sheep/api/trade/order.js index 10cb6352..32772055 100644 --- a/sheep/api/trade/order.js +++ b/sheep/api/trade/order.js @@ -93,6 +93,23 @@ const OrderApi = { }, }); }, + // 获得订单详细：sync 是可选参数 + // PATH需包含「${商品订单号} 」，微信将把你在支付预下单接口填入的 out_trade_no 替换此内容，如「index/orderDetail?id=${商品订单号}&channel=1」。PATH最多输入1条。 + // https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order_center/order_center.html + // 小程序商品订单详情path配置为：pages/order/detail?id=${商品订单号}&comein_type=wechat + getOrderDetailByPayOrderNo: (id, sync) => { + return request({ + url: `/trade/order/get-detailByPayOrderNo`, + method: 'GET', + params: { + id, + sync, + }, + custom: { + showLoading: false, + }, + }); + }, // 订单列表 getOrderPage: (params) => { return request({ From 3100d538fb9c6dad462b12f87515b6cd1c3099d3 Mon Sep 17 00:00:00 2001 From: wuKong Date: Mon, 10 Nov 2025 16:03:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(order):=E4=BF=AE=E6=AD=A3=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E5=9C=BA=E6=99=AF=E4=B8=8B=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 getOrderDetailByPayOrderNo 方法重命名为 getOrderDetailByOutTradeNo - 更新接口 URL 路径以匹配新的方法名 --- pages/order/detail.vue | 2 +- sheep/api/trade/order.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/order/detail.vue b/pages/order/detail.vue index 635d18ba..b39b4045 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -405,7 +405,7 @@ let res; if (state.comeinType === 'wechat') { // TODO 芋艿：【微信物流】微信场景下 - res = await OrderApi.getOrderDetailByPayOrderNo(id, { + res = await OrderApi.getOrderDetailByOutTradeNo(id, { merchant_trade_no: state.merchantTradeNo, }); } else { diff --git a/sheep/api/trade/order.js b/sheep/api/trade/order.js index 32772055..23049162 100644 --- a/sheep/api/trade/order.js +++ b/sheep/api/trade/order.js @@ -97,9 +97,9 @@ const OrderApi = { // PATH需包含「${商品订单号} 」，微信将把你在支付预下单接口填入的 out_trade_no 替换此内容，如「index/orderDetail?id=${商品订单号}&channel=1」。PATH最多输入1条。 // https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order_center/order_center.html // 小程序商品订单详情path配置为：pages/order/detail?id=${商品订单号}&comein_type=wechat - getOrderDetailByPayOrderNo: (id, sync) => { + getOrderDetailByOutTradeNo: (id, sync) => { return request({ - url: `/trade/order/get-detailByPayOrderNo`, + url: `/trade/order/get-detailByOutTradeNo`, method: 'GET', params: { id, From 9f6fc7a652f43fa05abc644c557a4812ee39e618 Mon Sep 17 00:00:00 2001 From: wuKong Date: Mon, 10 Nov 2025 16:23:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(order):=E4=BF=AE=E5=A4=8D=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E5=9C=BA=E6=99=AF=E4=B8=8B=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=8E=B7=E5=8F=96=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了错误的 getOrderDetailByOutTradeNo 方法调用 - 统一使用 getOrderDetail 方法处理订单详情请求 - 保留了 merchant_trade_no 参数以兼容现有逻辑 --- pages/order/detail.vue | 2 +- sheep/api/trade/order.js | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/pages/order/detail.vue b/pages/order/detail.vue index b39b4045..f6aad236 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -405,7 +405,7 @@ let res; if (state.comeinType === 'wechat') { // TODO 芋艿：【微信物流】微信场景下 - res = await OrderApi.getOrderDetailByOutTradeNo(id, { + res = await OrderApi.getOrderDetail(id, { merchant_trade_no: state.merchantTradeNo, }); } else { diff --git a/sheep/api/trade/order.js b/sheep/api/trade/order.js index 23049162..10cb6352 100644 --- a/sheep/api/trade/order.js +++ b/sheep/api/trade/order.js @@ -93,23 +93,6 @@ const OrderApi = { }, }); }, - // 获得订单详细：sync 是可选参数 - // PATH需包含「${商品订单号} 」，微信将把你在支付预下单接口填入的 out_trade_no 替换此内容，如「index/orderDetail?id=${商品订单号}&channel=1」。PATH最多输入1条。 - // https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order_center/order_center.html - // 小程序商品订单详情path配置为：pages/order/detail?id=${商品订单号}&comein_type=wechat - getOrderDetailByOutTradeNo: (id, sync) => { - return request({ - url: `/trade/order/get-detailByOutTradeNo`, - method: 'GET', - params: { - id, - sync, - }, - custom: { - showLoading: false, - }, - }); - }, // 订单列表 getOrderPage: (params) => { return request({