Merge branch 'kuaiyingyong' of iqiyoo:zhuishuyun_wap into wzq_yh

app/Jobs/CycleCallBack.php

@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * 循环上报，上报m个，停止上报n个
+ * 
+ */
+
+namespace App\Jobs;
+
+use GuzzleHttp\Client;
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Redis;
+use DB;
+use  App\Modules\Callback\Services\QappCycleCallBackService;
+
+class CycleCallBack implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    private $order_on;
+
+    public function __construct($order_on)
+    {
+        $this->order_on = $order_on;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        
+    }
+
+}

app/Modules/SendOrder/Models/QappSendOrder.php

@@ -16,6 +16,7 @@ class QappSendOrder extends Model
         'report_rate',
         'first_charge_template_id',
         'second_charge_template_id',
+        'callback_type',
     ];
 
     /**

app/Modules/Trade/Pay/PaySuccessAbstract.php

@@ -17,6 +17,7 @@ use Exception;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Redis;
+use App\Jobs\CycleCallBack;
 
 /**
  *
@@ -110,7 +111,13 @@ abstract class PaySuccessAbstract
         // 需要跟派单设置的回传类型一致才上报
         myLog('qapp_user_charge')->info('addQueue', compact('tikTokChargeRequest'));
         $job = new NewQappTikTokUserCharge($tikTokChargeRequest);
-        dispatch($job->onConnection('rabbitmq')->onQueue('qapp_tiktok_user_charge_queue'));
+        $callback_type = getProp($quickSendOrder, 'callback_type');
+        if ($callback_type == 'cycle_report') {
+            $cycjob = new CycleCallBack($this->order->trade_no);
+            dispatch($cycjob->onConnection('redis')->onQueue('{qapp_tiktok_cycle_user_charge_queue}'));
+        }else{
+            dispatch($job->onConnection('rabbitmq')->onQueue('qapp_tiktok_user_charge_queue'));
+        }
 
         // 同步数据
         $this->order->distribution_channel_id = getProp($quickSendOrder, 'distribution_channel_id');