From 372494883079be03b921f6686691271355bfdd14 Mon Sep 17 00:00:00 2001
From: huangsijun <1773182001@qq.com>
Date: Thu, 06 Nov 2025 12:04:52 +0800
Subject: [PATCH] 修改订单保存另外参数  微信支付预下单接口填入的 out_trade_no

---
 admin/app/api/model/order/Order.php |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/admin/app/api/model/order/Order.php b/admin/app/api/model/order/Order.php
index be488ed..cfff239 100644
--- a/admin/app/api/model/order/Order.php
+++ b/admin/app/api/model/order/Order.php
@@ -342,7 +342,11 @@
     public static function getUserOrderDetail($order_id, $user_id)
     {
         $model = new static();
-        $order = $model->where(['order_id' => $order_id, 'user_id' => $user_id])->with(['product' => ['image', 'refund'], 'address', 'express', 'extractStore','extractClerk', 'supplier', 'advance'])->find();
+        $where = ['order_id' => $order_id, 'user_id' => $user_id];
+        if(strlen($order_id)>=14){ //按照微信支付的 预下单填入的out_trade_no
+            $where = ['ins_order_sn' => $order_id, 'user_id' => $user_id];
+        }
+        $order = $model->where($where)->with(['product' => ['image', 'refund'], 'address', 'express', 'extractStore','extractClerk', 'supplier', 'advance'])->find();
         if (empty($order)) {
             throw new BaseException(['msg' => '订单不存在']);
         }

--
Gitblit v1.9.2