add - 可修改活动商品信息

app/adminapi/logic/goods/GoodsLogic.php

@@ -86,6 +86,7 @@ class GoodsLogic extends BaseLogic
                 'is_activity' => $params['is_activity'] ??0,
                 'property_activity_id' => $params['property_activity_id'] ??0,
                 'labels' => (isset($params['labels']) && $params['labels'])?implode(',',$params['labels']):'',
+                'activity_service_fee' => $params['activity_service_fee'] ??'',
             ]);
 
             Db::commit();
@@ -157,6 +158,7 @@ class GoodsLogic extends BaseLogic
                 'is_activity' => $params['is_activity'] ??0,
                 'property_activity_id' => $params['property_activity_id'] ??0,
                 'labels' => (isset($params['labels']) && $params['labels'])?implode(',',$params['labels']):'',
+                'activity_service_fee' => $params['activity_service_fee'] ??'',
             ]);
 
             //更新绩效规则

app/adminapi/logic/property/PropertyActivityLogic.php

@@ -101,7 +101,7 @@ class PropertyActivityLogic extends BaseLogic
     public static function configureReservedField($data, $reserved_type,$reserved_field = []): array
     {
         if($reserved_type === 'block_data'){
-            $reserved_field = ['id','recommend_weight','goods_name'];
+            $reserved_field = ['id','recommend_weight','goods_name','base_service_fee','service_total','service_fee','activity_service_fee'];
             foreach ($data as $key => &$item) {
                 $data[$key]['block_key'] = $key+1;
                 foreach ($item['goods'] as &$good) {

app/api/logic/ActivityLogic.php

@@ -91,7 +91,11 @@ class ActivityLogic extends BaseLogic
             array_multisort(array_column($v['goods'], 'recommend_weight'), SORT_DESC, $v['goods']);
             if(!empty($v['goods'])){
                 foreach ($v['goods'] as &$item){
+                    $reserved_fields = $item;
                     $item = Goods::findOrEmpty($item['id'])->toArray();
+                    foreach ($reserved_fields as $field => $value) {
+                        !empty($value) && $item[$field] = $value;
+                    }
 
                     // 临时改价 11-28
                     $item['service_fee'] = $item['base_service_fee'];