fly 4 роки тому
батько
коміт
c068079474

+ 1 - 1
src/Controllers/LandingPage/Transformers/ReportOrderTramsformer.php

@@ -50,7 +50,7 @@ class ReportOrderTramsformer
             'charge_ip' => $item->create_ip,
             'bind_id' => $item->reportUser ? $item->reportUser->id : 0,
             'adid' => $item->reportUser ? $item->reportUser->adid : 0,
-            'aid_name' => $item->reportUser ? $item->reportUser->aid_name ?? '' : '',
+            'aid_name' => $item->reportUser ? urldecode($item->reportUser->aid_name) ?? '' : '',
             'platform' => $this->getPlatform($item),
             'status' => $status,
             'type' => $item->reportOrder ? $item->reportOrder->type : '',

+ 11 - 0
src/Requests/QueryReportRequest.php

@@ -2,6 +2,8 @@
 
 namespace General\Requests;
 
+use General\Services\LandingPage\LandingPageLinkService;
+use Illuminate\Validation\Rule;
 
 class QueryReportRequest extends Request
 {
@@ -13,6 +15,15 @@ class QueryReportRequest extends Request
             'uid' => 'integer',
             'send_order_id' => 'integer|exists:qapp_send_orders:send_order_id',
             'adid' => 'string',
+            'type' => ['string', Rule::in([
+                'amount_filter',
+                'register_24_charge',
+                'current_day_register',
+                'no_user_match',
+                'feedback_user',
+                'percent_filter',
+                'protected_eligible',
+            ])],
         ];
     }
 }

+ 8 - 0
src/Services/LandingPage/LandingPageLinkService.php

@@ -217,6 +217,14 @@ class LandingPageLinkService
                     ->where('report_user_bind_records.adid', $params['adid']);
             });
         }
+        if (isset($params['type']) && $params['type']) {
+            $sql->whereExists(function ($query) use ($params) {
+                $query->select(DB::raw(1))
+                    ->from('report_user_charge_records')
+                    ->whereRaw('report_user_charge_records.order_no = orders.trade_no')
+                    ->where('report_user_charge_records.type', $params['type']);
+            });
+        }
         if ($is_page) {
             return $sql->paginate();
         } else {