change

app/Console/Commands/CodeDemo.php

@@ -0,0 +1,10 @@
+<?php
+
+
+namespace App\Console\Commands;
+
+
+class CodeDemo
+{
+
+}

app/Modules/Trade/Pay/PaySuccessAbstract.php

@@ -92,23 +92,22 @@ abstract class PaySuccessAbstract
         $user           = User::getUser($this->order->uid);
         $sendOrderId    = getProp($user, 'send_order_id');
         $quickSendOrder = QappSendOrder::getSendOrderById($sendOrderId);
-        if ($quickSendOrder) {
-            // 队列处理回传业务
-            $tikTokChargeRequest                = new QappTikTokUserChargeRequest();
-            $tikTokChargeRequest->uid           = $this->order->uid;
-            $tikTokChargeRequest->amount        = $this->order->price;
-            $tikTokChargeRequest->pay_time      = $this->order->created_at;
-            $tikTokChargeRequest->type          = $this->getReportType($this->order->distribution_channel_id);
-            $tikTokChargeRequest->book_id       = $book_id;
-            $tikTokChargeRequest->book_name     = $book_name;
-            $tikTokChargeRequest->send_order_id = $sendOrderId;
-            $tikTokChargeRequest->molecule      = (int)getProp($quickSendOrder, 'report_rate');
+        $reportType     = getProp($quickSendOrder, 'report_type');
+        $reportRate     = (int)getProp($quickSendOrder, 'report_rate', 100);
 
-            // 需要跟派单设置的回传类型一致才上报
-            if ($tikTokChargeRequest->type === getProp($quickSendOrder, 'report_type')) {
-                $job = new QappTikTokUserCharge($tikTokChargeRequest);
-                dispatch($job->onConnection('rabbitmq')->onQueue('qapp_tiktok_user_charge_queue'));
-            }
-        }
+        // 队列处理回传业务
+        $tikTokChargeRequest                = new QappTikTokUserChargeRequest();
+        $tikTokChargeRequest->uid           = $this->order->uid;
+        $tikTokChargeRequest->amount        = $this->order->price;
+        $tikTokChargeRequest->pay_time      = $this->order->created_at;
+        $tikTokChargeRequest->type          = $reportType ?: $this->getReportType($this->order->distribution_channel_id);
+        $tikTokChargeRequest->book_id       = $book_id;
+        $tikTokChargeRequest->book_name     = $book_name;
+        $tikTokChargeRequest->send_order_id = $sendOrderId;
+        $tikTokChargeRequest->molecule      = $reportRate;
+
+        // 需要跟派单设置的回传类型一致才上报
+        $job = new QappTikTokUserCharge($tikTokChargeRequest);
+        dispatch($job->onConnection('rabbitmq')->onQueue('qapp_tiktok_user_charge_queue'));
     }
 }

app/Modules/User/Services/QappUserService.php

@@ -9,7 +9,6 @@ use App\Consts\QuickConst;
 use App\Jobs\QappTikTok\QappTikTokUserRequest;
 use App\Jobs\QappTikTok\QappTikTokUser;
 use App\Libs\Utils;
-use App\Modules\SendOrder\Models\QappSendOrder;
 use App\Modules\User\Models\QappPackage;
 use App\Modules\User\Models\QappUser;
 use App\Modules\User\Models\User;
@@ -194,23 +193,19 @@ class QappUserService
             $qapp_user->user = $user;
             DB::commit();
 
-            // 派单信息
-            $quickSendOrder = QappSendOrder::getSendOrderById($data['send_order_id']);
-            if ($quickSendOrder) {
-                // 队列处理回传业务
-                $tikTokRegisterRequest                = new QappTikTokUserRequest();
-                $tikTokRegisterRequest->ip            = $user->register_ip;
-                $tikTokRegisterRequest->device_no     = $data['device_no'];
-                $tikTokRegisterRequest->mac           = $data['mac'];
-                $tikTokRegisterRequest->channel_id    = $channel_id;
-                $tikTokRegisterRequest->uid           = $user->id;
-                $tikTokRegisterRequest->register_time = $user->created_at;
-                $tikTokRegisterRequest->send_order_id = $data['send_order_id'];
-
-                // 回传业务
-                $job = new QappTikTokUser($tikTokRegisterRequest);
-                dispatch($job->onConnection('rabbitmq')->onQueue('qapp_tiktok_user_register_queue'));
-            }
+            // 队列处理回传业务
+            $tikTokRegisterRequest                = new QappTikTokUserRequest();
+            $tikTokRegisterRequest->ip            = $user->register_ip;
+            $tikTokRegisterRequest->device_no     = $data['device_no'];
+            $tikTokRegisterRequest->mac           = $data['mac'];
+            $tikTokRegisterRequest->channel_id    = $channel_id;
+            $tikTokRegisterRequest->uid           = $user->id;
+            $tikTokRegisterRequest->register_time = $user->created_at;
+            $tikTokRegisterRequest->send_order_id = $data['send_order_id'];
+
+            // 回传业务
+            $job = new QappTikTokUser($tikTokRegisterRequest);
+            dispatch($job->onConnection('rabbitmq')->onQueue('qapp_tiktok_user_register_queue'));
 
             UserTaskService::addUserTaskQueue($user->id, BaseTask::register, UserTaskService::add_trigger);
             return $qapp_user;