|
@@ -51,10 +51,6 @@ class ActivityLogic extends BaseLogic
|
|
|
array_multisort(array_column($res['activity_info']['block_data'], 'sort'), SORT_DESC, $res['activity_info']['block_data']);
|
|
array_multisort(array_column($res['activity_info']['block_data'], 'sort'), SORT_DESC, $res['activity_info']['block_data']);
|
|
|
foreach ($res['activity_info']['block_data'] as &$v){
|
|
foreach ($res['activity_info']['block_data'] as &$v){
|
|
|
array_multisort(array_column($v['goods'], 'recommend_weight'), SORT_DESC, $v['goods']);
|
|
array_multisort(array_column($v['goods'], 'recommend_weight'), SORT_DESC, $v['goods']);
|
|
|
- // 临时添加
|
|
|
|
|
- foreach ($v['goods'] as &$good){
|
|
|
|
|
- $good['service_fee'] = $good['base_service_fee'];
|
|
|
|
|
- }
|
|
|
|
|
$v['goods'] = self::groupArrays($v['goods']);
|
|
$v['goods'] = self::groupArrays($v['goods']);
|
|
|
}
|
|
}
|
|
|
$res['coupons'] = CouponRules::with(['couponCategoryOne'])->where('property_activity_id',$params['property_activity_id'])
|
|
$res['coupons'] = CouponRules::with(['couponCategoryOne'])->where('property_activity_id',$params['property_activity_id'])
|
|
@@ -69,6 +65,10 @@ class ActivityLogic extends BaseLogic
|
|
|
->order('is_recommend desc')
|
|
->order('is_recommend desc')
|
|
|
->select()
|
|
->select()
|
|
|
->toArray();
|
|
->toArray();
|
|
|
|
|
+ // 临时添加
|
|
|
|
|
+ foreach ($res['goods'] as &$good){
|
|
|
|
|
+ $good['service_fee'] = $good['base_service_fee'];
|
|
|
|
|
+ }
|
|
|
return $res;
|
|
return $res;
|
|
|
}catch(\Exception $e){
|
|
}catch(\Exception $e){
|
|
|
throw new \Exception($e->getMessage());
|
|
throw new \Exception($e->getMessage());
|