From 25a3e9bb63fe83f7c82180a7d373a331b2f41acb Mon Sep 17 00:00:00 2001
From: huangsijun <1773182001@qq.com>
Date: Thu, 06 Nov 2025 11:33:03 +0800
Subject: [PATCH] 更新前端订单详情获取的处理，增加判断是不是订单号过来的
---
admin/app/api/model/branch/ActivityUser.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/admin/app/api/model/branch/ActivityUser.php b/admin/app/api/model/branch/ActivityUser.php
index 4e8d83c..8fa0ae3 100644
--- a/admin/app/api/model/branch/ActivityUser.php
+++ b/admin/app/api/model/branch/ActivityUser.php
@@ -118,6 +118,7 @@
'in_radius' => $params['in_radius'],
'app_id' => self::$app_id,
];
+ $data['trade_no'] = $data['order_no'];
$this->save($data);
// 如果不需要在线支付
if ($data['online_money'] == 0) {
@@ -206,7 +207,7 @@
return PaymentService::wechat(
$user,
$order_no,
- OrderTypeEnum::MASTER,
+ OrderTypeEnum::BRANCHACTIVITY,
$pay_source,
$online_money
);
--
Gitblit v1.9.2