From 59c34db03fb8b96e459227959ab63263dc9becc5 Mon Sep 17 00:00:00 2001
From: wuKong <crossdream@sina.cn>
Date: Mon, 24 Nov 2025 18:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(order):=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 引入 vue 的 watch 方法监听订单 ID 变化
- 新增 PayOrderApi 模块用于查询支付订单
- 在 onLoad 中增加对 payOrderNo 参数的处理逻辑
- 通过 payOrderNo 查询 merchantOrderId 并赋值给订单 ID
- 使用 watch 替代 onShow 中直接调用 getOrderDetail 方法
- 修改 PayOrderApi.getOrder 方法支持 no 参数查询
---
 pages/order/detail.vue | 26 ++++++++++++++++++++++++--
 sheep/api/pay/order.js |  8 ++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index f6aad236..b3b6358e 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -259,7 +259,7 @@
 <script setup>
   import sheep from '@/sheep';
   import { onLoad, onShow } from '@dcloudio/uni-app';
-  import { reactive, ref } from 'vue';
+  import { reactive, ref, watch } from 'vue';
   import { isEmpty } from 'lodash-es';
   import {
     fen2yuan,
@@ -269,6 +269,7 @@
   } from '@/sheep/hooks/useGoods';
   import OrderApi from '@/sheep/api/trade/order';
   import DeliveryApi from '@/sheep/api/trade/delivery';
+  import PayOrderApi from '@/sheep/api/pay/order';
   import PickUpVerify from '@/pages/order/pickUpVerify.vue';
 
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
@@ -429,7 +430,11 @@
 
   onShow(async () => {
     //onShow中获取订单列表,保证跳转后页面为最新状态
-    await getOrderDetail(state.orderInfo.id);
+
+    //options.payOrderNo传值的情况下,onLoad 会去查询支付订单
+    //此时state.orderInfo.id没有值，onShow await getOrderDetail会出现异常
+    //改用watch监听state.orderInfo.id 方式 await getOrderDetail
+    //await getOrderDetail(state.orderInfo.id);
   });
 
   onLoad(async (options) => {
@@ -437,6 +442,17 @@
     if (options.id) {
       id = options.id;
     }
+    if (options.payOrderNo) {
+      // 查询支付订单：根据 payOrderNo 取 merchantOrderId ，merchantOrderId 即 tradeOrderId
+      // 例：小程序商品订单详情path
+      // -- https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order_center/order_center.html
+      // -- 配置参考：pages/order/detail?payOrderNo=${商品订单号}
+      // -- ${商品订单号} out_trade_no 为 payOrderNo，根据 payOrderNo 取 merchantOrderId ，merchantOrderId 即 tradeOrderId
+      const payOrder = await PayOrderApi.getOrder(undefined,undefined, options.payOrderNo);
+      if (payOrder.code === 0) {
+        id = payOrder.data?.merchantOrderId || id;
+      }
+    }
     // TODO 芋艿：【微信物流】下面两个变量，后续接入
     state.comeinType = options.comein_type;
     if (state.comeinType === 'wechat') {
@@ -444,6 +460,12 @@
     }
     state.orderInfo.id = id;
   });
+
+  watch(() => state.orderInfo.id, async (newId) => {
+    if (newId) {
+      await getOrderDetail(newId);
+    }
+  });
 </script>
 
 <style lang="scss" scoped>
diff --git a/sheep/api/pay/order.js b/sheep/api/pay/order.js
index f7bef28f..834f59cc 100644
--- a/sheep/api/pay/order.js
+++ b/sheep/api/pay/order.js
@@ -2,11 +2,15 @@ import request from '@/sheep/request';
 
 const PayOrderApi = {
   // 获得支付订单
-  getOrder: (id, sync) => {
+  getOrder: (id, sync, no) => {
+    const params = {};
+    if (id) params.id = id;
+    if (no) params.no = no;
+    if (sync !== undefined) params.sync = sync;
     return request({
       url: '/pay/order/get',
       method: 'GET',
-      params: { id, sync },
+      params,
     });
   },
   // 提交支付订单