wikiboss/xionggeshop
1
0
派生 0
代码 工单 合并请求 Actions 软件包 项目 版本发布 百科 动态

feat(shopro): 新增复购立减活动类型并优化订单活动信息显示

浏览代码
这个提交包含在：
可乐加冰
2026-09-12 22:31:14 +08:00
父节点 a6415f7753
当前提交 bb69a43a0f
共有 2 个文件被更改，包括 8 次插入 和 4 次删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

1
application/admin/model/shopro/activity/Activity.php
查看文件

@@ -43,6 +43,7 @@ class Activity extends Model
'full_discount' => '满额折扣', 'full_discount' => '满额折扣',
'free_shipping' => '满额包邮', 'free_shipping' => '满额包邮',
'promote' => '限时促销', 'promote' => '限时促销',
'repurchase' => '复购立减',
]; ];
} }

11
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']) { if ($ext && isset($ext['activity_discount_infos']) && $ext['activity_discount_infos']) {
$typeList = Activity::getTypeList();
foreach ($ext['activity_discount_infos'] as $key => $info) { foreach ($ext['activity_discount_infos'] as $key => $info) {
$ext['activity_discount_infos'][$key]['activity_type_text'] = Activity::getTypeList()[$info['activity_type']]; $activityType = $info['activity_type'] ?? '';
$ext['activity_discount_infos'][$key]['format_text'] = \addons\shopro\model\Activity::formatDiscountTags($info['activity_type'], array_merge([ $ext['activity_discount_infos'][$key]['activity_type_text'] = $typeList[$activityType] ?? ($info['activity_title'] ?? $activityType);
'type' => $info['rule_type'], $discountRule = is_array($info['discount_rule'] ?? null) ? $info['discount_rule'] : [];
], $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; return $ext;