From c13b8914228e6a404bd60ee36bf2479383da8f23 Mon Sep 17 00:00:00 2001
From: liyaozhi <lzhflash@163.com>
Date: Sun, 09 Nov 2025 10:55:14 +0800
Subject: [PATCH] 111
---
admin/app/api/model/order/Order.php | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/admin/app/api/model/order/Order.php b/admin/app/api/model/order/Order.php
index cfff239..9d2a0e9 100644
--- a/admin/app/api/model/order/Order.php
+++ b/admin/app/api/model/order/Order.php
@@ -344,9 +344,15 @@
$model = new static();
$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];
+ $where = ['trade_no' => $order_id, 'user_id' => $user_id];
+ $order = $model->where($where)->with(['product' => ['image', 'refund'], 'address', 'express', 'extractStore','extractClerk', 'supplier', 'advance'])->find();
+ if(!$order){
+ $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();
+ }
+ }else{
+ $order = $model->where($where)->with(['product' => ['image', 'refund'], 'address', 'express', 'extractStore','extractClerk', 'supplier', 'advance'])->find();
}
- $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