Wang Chen 4 роки тому
батько
коміт
a920eeeb4e

+ 5 - 5
app/Modules/Trade/Pay/PaySuccessAbstract.php

@@ -102,13 +102,13 @@ abstract class PaySuccessAbstract
             $tikTokChargeRequest->book_id       = $book_id;
             $tikTokChargeRequest->book_name     = $book_name;
             $tikTokChargeRequest->send_order_id = $sendOrderId;
-            $tikTokChargeRequest->report_type   = getProp($quickSendOrder, 'report_type');
-            $tikTokChargeRequest->report_rate   = (int)getProp($quickSendOrder, 'report_rate');
             $tikTokChargeRequest->molecule      = (int)getProp($quickSendOrder, 'report_rate');
 
-            // 回传队列
-            $job = new QappTikTokUserCharge($tikTokChargeRequest);
-            dispatch($job->onConnection('rabbitmq')->onQueue('qapp_tiktok_user_charge_queue'));
+            // 需要跟派单设置的回传类型一致才上报
+            if ($tikTokChargeRequest->type === getProp($quickSendOrder, 'report_type')) {
+                $job = new QappTikTokUserCharge($tikTokChargeRequest);
+                dispatch($job->onConnection('rabbitmq')->onQueue('qapp_tiktok_user_charge_queue'));
+            }
         }
     }
 }

+ 0 - 2
app/Modules/User/Services/QappUserService.php

@@ -206,8 +206,6 @@ class QappUserService
                 $tikTokRegisterRequest->uid           = $user->id;
                 $tikTokRegisterRequest->register_time = $user->created_at;
                 $tikTokRegisterRequest->send_order_id = $data['send_order_id'];
-                $tikTokRegisterRequest->report_type   = getProp($quickSendOrder, 'report_type');
-                $tikTokRegisterRequest->report_rate   = getProp($quickSendOrder, 'report_rate');
 
                 // 回传业务
                 $job = new QappTikTokUser($tikTokRegisterRequest);