add report type

app/Jobs/QappTikTokUser.php

@@ -62,11 +62,11 @@ class QappTikTokUser implements ShouldQueue
         $params['sign'] = _sign($params, SysConsts::TIKTOK_KEY);
         $url = 'https://newtrackapi.zhuishuyun.com/api/qappuser/register';
         $response =  $client->request('post', $url, ['form_params' => $params])->getBody()->getContents();
-        myLog('new_user_register')->info($response);
+        myLog('qapp_user_register')->info($response);
         $result =  json_decode($response);
         if ($result) {
             if ($result->code != 0) {
-                myLog('new_user_register')->info($response);
+                myLog('qapp_user_register')->info($response);
             }
         }
     }

app/Jobs/QappTikTokUserCharge.php

@@ -43,6 +43,11 @@ class QappTikTokUserCharge implements ShouldQueue
      */
     const CURRENT_DAY_REGISTER = 'current_day_register';
     /**
+     * 注册24小时之内充值
+     */
+    const REGISTER_24_CHARGE = 'register_24_charge';
+
+    /**
      * Create a new job instance.
      *
      * @return void
@@ -80,11 +85,11 @@ class QappTikTokUserCharge implements ShouldQueue
         ];
         $params['sign'] = _sign($params,  SysConsts::TIKTOK_KEY);
         $response =  $client->request('post', $this->url, ['form_params' => $params])->getBody()->getContents();
-        myLog('new_user_charge')->info($response);
+        myLog('qapp_user_charge')->info($response);
         $result =  json_decode($response);
         if ($result) {
             if ($result->code != 0) {
-                myLog('new_user_charge')->info($response);
+                myLog('qapp_user_charge')->info($response);
             }
         }
     }

app/Modules/Trade/Pay/PaySuccessAbstract.php

@@ -9,6 +9,7 @@ use App\Modules\User\Services\ReadRecordService;
 use Exception;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
+use Redis;
 
 /**
  * 
@@ -42,7 +43,7 @@ abstract class PaySuccessAbstract
          return true;
       } catch (Exception $e) {
          DB::rollback();
-         Log::error('pay.success: ' . $e->getMessage().' '.$e->getTraceAsString());
+         Log::error('pay.success: ' . $e->getMessage() . ' ' . $e->getTraceAsString());
       }
    }
 
@@ -68,13 +69,19 @@ abstract class PaySuccessAbstract
       return $count + 1;
    }
 
+   private function getReportType(int $channel_id)
+   {
+      return Redis::hGet('channel:setting:' . $channel_id, 'tiktok_report_type') ??  QappTikTokUserCharge::REGISTER_24_CHARGE;
+   }
+
+
    protected function addQueue()
    {
       $bid = ReadRecordService::getSimpleFirstReadRecord($this->order->uid);
       $book_id = book_hash_encode($bid);
       $book = BookConfig::where('bid', $bid)->select('book_name')->first();
       $book_name = $book ? $book->book_name : '';
-      $job = new QappTikTokUserCharge($this->order->uid, $this->order->price, $this->order->created_at, QappTikTokUserCharge::CURRENT_DAY_REGISTER, $book_id, $book_name);
+      $job = new QappTikTokUserCharge($this->order->uid, $this->order->price, $this->order->created_at, $this->getReportType($this->order->distribution_channel_id), $book_id, $book_name);
       dispatch($job->onConnection('rabbitmq')->onQueue('qapp_tiktok_user_charge_queue'));
    }
 }