回传日志新字段

src/Controllers/LandingPage/LinkController.php

@@ -205,6 +205,7 @@ class LinkController extends Controller
             $temp['report_percent']= $value['report_percent'];
             $temp['config_percent']= $value['config_percent'];
             $temp['adid']= $value['adid'];
+            $temp['promotion_id'] = $value['promotion_id'];
             $data[] = $temp;
         }
         $headers = [
@@ -221,7 +222,8 @@ class LinkController extends Controller
             '回传结果',
             '回传百分比',
             '回传配置百分比',
-            '广告计划id'
+            '广告计划id',
+            '广告id2.0',
         ];
         ExcelHelper::exportWebFileCsv($headers, $data, "回传日志");
     }

src/Controllers/LandingPage/Transformers/ReportOrderTramsformer.php

@@ -76,6 +76,7 @@ class ReportOrderTramsformer
             'config_percent' => ($item->reportOrder ? $item->reportOrder->config_percent * 100 : 0) . '%',
             'send_order_id' => $item->send_order_id,
             'nickname' => $item->nickname,
+            'promotion_id' => $item->reportUser ? $item->reportUser->promotion_id : 0,
         ];
     }
 

src/Services/LandingPage/LandingPageLinkService.php

@@ -243,6 +243,14 @@ class LandingPageLinkService
                     ->where('report_user_bind_records.adid', $params['adid']);
             });
         }
+        if (isset($params['promotion_id']) && $params['promotion_id']) {
+            $sql->whereExists(function ($query) use ($params) {
+                $query->select(DB::raw(1))
+                    ->from('report_user_bind_records')
+                    ->whereRaw('report_user_bind_records.uid = orders.uid')
+                    ->where('report_user_bind_records.promotion_id', $params['promotion_id']);
+            });
+        }
         if (isset($params['link_source']) && $params['link_source']) {
             $sql->whereExists(function ($query) use ($params) {
                 $query->select(DB::raw(1))