type change

src/Controllers/LandingPage/Transformers/ReportOrderTramsformer.php

@@ -13,6 +13,7 @@ use General\Models\Order\Order;
 class ReportOrderTramsformer
 {
     const REPORT_TYPE = [
+        'no_log' => '无回传日志',
         'amount_filter' => '回传金额过滤',
         'register_24_charge' => '充值时间和注册时间必须在24小时以内',
         'current_day_register' => '注册时间和充值时间必须同一天',
@@ -33,13 +34,6 @@ class ReportOrderTramsformer
 
     public function transform($item)
     {
-
-        $reason = $this->getType($item);
-        $status = $item->reportOrder ? $item->reportOrder->status : 0;
-        if ($status == 1) {
-            $reason = '';
-        }
-
         return [
             'order_no' => $item->trade_no,
             'uid' => $item->uid,
@@ -52,9 +46,9 @@ class ReportOrderTramsformer
             'adid' => $item->reportUser ? $item->reportUser->adid : 0,
             'aid_name' => $item->reportUser ? urldecode($item->reportUser->aid_name) ?? '' : '',
             'platform' => $this->getPlatform($item),
-            'status' => $status,
+            'status' => $item->reportOrder ? $item->reportOrder->status : 0,
             'type' => $item->reportOrder ? $item->reportOrder->type : '',
-            'content' => $reason,
+            'content' =>  $item->reportOrder && $item->reportOrder->status == 1 ? '' : $this->getType($item),
             'report_percent' => ($item->reportOrder ? $item->reportOrder->report_percent * 100 : 0) . '%',
             'config_percent' => ($item->reportOrder ? $item->reportOrder->config_percent * 100 : 0) . '%',
         ];
@@ -62,18 +56,13 @@ class ReportOrderTramsformer
 
     private function getPlatform(Order $item)
     {
-        if ($item->reportUser) {
-            return self::platform[$item->reportUser->platform];
-        }
-        return '';
+        return $item->reportUser ? self::platform[$item->reportUser->platform] : '';
     }
 
     private function getType(Order $item)
     {
-        if ($item->reportOrder) {
-            return array_key_exists($item->reportOrder->type, self::REPORT_TYPE) ? self::REPORT_TYPE[$item->reportOrder->type] : '';
-        } else {
-            return self::REPORT_TYPE['no_user_match'];
-        }
+        return $item->reportOrder ?
+            (array_key_exists($item->reportOrder->type, self::REPORT_TYPE) ? self::REPORT_TYPE[$item->reportOrder->type] : '')
+            : self::REPORT_TYPE['no_log'];
     }
 }

src/Requests/QueryReportRequest.php

@@ -16,6 +16,7 @@ class QueryReportRequest extends Request
             'send_order_id' => 'integer|exists:qapp_send_orders:send_order_id',
             'adid' => 'string',
             'type' => ['string', Rule::in([
+                'no_log',
                 'amount_filter',
                 'register_24_charge',
                 'current_day_register',

src/Services/LandingPage/LandingPageLinkService.php

@@ -218,12 +218,16 @@ class LandingPageLinkService
             });
         }
         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 ($params['type'] == 'no_log') {
+            } else {
+                $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'])
+                        ->where('report_user_charge_records.status', 0);
+                });
+            }
         }
         if (isset($params['status']) && is_numeric($params['status'])) {
             $sql->whereExists(function ($query) use ($params) {