From 274dab15bfc890c9c18544edd53a63130bc7fb5e Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 03 Nov 2025 16:10:34 +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