From bb69a43a0fd61b7be29c74d4532623edfcf5cd23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=AF=E4=B9=90=E5=8A=A0=E5=86=B0?=
 <11869599+addie66@user.noreply.gitee.com>
Date: Sat, 12 Sep 2026 22:31:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(shopro):=20=E6=96=B0=E5=A2=9E=E5=A4=8D?=
 =?UTF-8?q?=E8=B4=AD=E7=AB=8B=E5=87=8F=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/model/shopro/activity/Activity.php |  1 +
 application/admin/model/shopro/order/Order.php       | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/application/admin/model/shopro/activity/Activity.php b/application/admin/model/shopro/activity/Activity.php
index d3da3e2..6e0d990 100644
--- a/application/admin/model/shopro/activity/Activity.php
+++ b/application/admin/model/shopro/activity/Activity.php
@@ -43,6 +43,7 @@ class Activity extends Model
             'full_discount' => '满额折扣',
             'free_shipping' => '满额包邮',
             'promote'       => '限时促销',
+            'repurchase'    => '复购立减',
         ];
     }
 
diff --git a/application/admin/model/shopro/order/Order.php b/application/admin/model/shopro/order/Order.php
index ee0fcc7..da20f3f 100644
--- a/application/admin/model/shopro/order/Order.php
+++ b/application/admin/model/shopro/order/Order.php
@@ -122,11 +122,14 @@ class Order extends Model
 
         if ($ext && isset($ext['activity_discount_infos']) && $ext['activity_discount_infos']) {
 
+            $typeList = Activity::getTypeList();
             foreach ($ext['activity_discount_infos'] as $key => $info) {
-                $ext['activity_discount_infos'][$key]['activity_type_text'] = Activity::getTypeList()[$info['activity_type']];
-                $ext['activity_discount_infos'][$key]['format_text']        = \addons\shopro\model\Activity::formatDiscountTags($info['activity_type'], array_merge([
-                    'type' => $info['rule_type'],
-                ], $info['discount_rule']));
+                $activityType = $info['activity_type'] ?? '';
+                $ext['activity_discount_infos'][$key]['activity_type_text'] = $typeList[$activityType] ?? ($info['activity_title'] ?? $activityType);
+                $discountRule = is_array($info['discount_rule'] ?? null) ? $info['discount_rule'] : [];
+                $ext['activity_discount_infos'][$key]['format_text'] = \addons\shopro\model\Activity::formatDiscountTags($activityType, array_merge([
+                    'type' => $info['rule_type'] ?? '',
+                ], $discountRule));
             }
         }
         return $ext;