优化复购功能:指定商品复购付款时直接立减(不返现),解耦分销买家佣金,纯后端实现
这个提交包含在:
@@ -55,10 +55,11 @@ class Order extends Model
|
||||
if ($ext && isset($ext['activity_discount_infos']) && $ext['activity_discount_infos']) {
|
||||
|
||||
foreach ($ext['activity_discount_infos'] as $key => $info) {
|
||||
$ext['activity_discount_infos'][$key]['activity_type_text'] = Activity::getTypeList()[$info['activity_type']];
|
||||
$typeList = Activity::getTypeList();
|
||||
$ext['activity_discount_infos'][$key]['activity_type_text'] = $typeList[$info['activity_type']] ?? ($info['activity_title'] ?? '优惠');
|
||||
$ext['activity_discount_infos'][$key]['format_text'] = Activity::formatDiscountTags($info['activity_type'], array_merge([
|
||||
'type' => $info['rule_type'],
|
||||
], $info['discount_rule']));
|
||||
'type' => $info['rule_type'] ?? 'money',
|
||||
], $info['discount_rule'] ?? []));
|
||||
}
|
||||
}
|
||||
return $ext;
|
||||
|
||||
在新工单中引用
屏蔽一个用户