fly 4 years ago
parent
commit
d0c2df11d5

+ 1 - 1
src/Controllers/CompanyAuth/Transformers/ActivityTransformer.php

@@ -22,7 +22,7 @@ class ActivityTransformer
             'created_at' => (string) $item->created_at,
             'start_time' => (string)$item->start_time,
             'end_time' => (string)$item->end_time,
-            'price' => $item->price,
+            'price' => $item->price ? $item->price : ($item->product ? $item->product->price : 0),
             'orderCount' => $item->orderCount,
             'totalChargeAmount' => $item->totalChargeAmount,
             'successOrderCount' => $item->successOrderCount,

+ 2 - 2
src/Services/Activity/ActivityService.php

@@ -19,7 +19,7 @@ class ActivityService
         })
             ->select([
                 'activity.id', 'activity.name', 'activity.created_at', 'activity.start_time', 'activity.price_title',
-                'activity.end_time', 'activity.activity_page', 'activity.distribution_channel_id',
+                'activity.end_time', 'activity.activity_page', 'activity.distribution_channel_id','activity.product_id',
                 'activity_statistic.success_order_num', 'activity_statistic.recharge_amount',
                 'activity_statistic.order_num', 'activity_statistic.pv', 'promotion_stats_created', 'merchants_stats_created'
             ])
@@ -67,7 +67,7 @@ class ActivityService
         })
             ->select([
                 'activity.id', 'activity.name', 'activity.created_at', 'activity.start_time', 'activity.price_title',
-                'activity.end_time', 'activity.activity_page', 'activity.setting', 'activity.distribution_channel_id',
+                'activity.end_time', 'activity.activity_page', 'activity.setting', 'activity.distribution_channel_id','activity.product_id',
                 'activity_statistic.success_order_num', 'activity_statistic.recharge_amount',
                 'activity_statistic.order_num', 'activity_statistic.pv', 'promotion_stats_created', 'merchants_stats_created'
             ])->whereIn('create_type', [0, 5])->where('activity.distribution_channel_id', $channel_id);