Merge branch 'master' of qk:yulf/general_channel

# Conflicts:
#	src/Services/LandingPage/LandingPageLinkService.php

src/Services/LandingPage/LandingPageLinkService.php

@@ -8,10 +8,7 @@ use General\Models\LandingPage\LandingPageDomain;
 use General\Models\LandingPage\LandingPageLink;
 use General\Models\LandingPage\LandingPageLinkLog;
 use General\Models\OfficialAccount\OfficialAccount;
-use General\Models\Qapp\QappSendOrders;
 use General\Models\Report\BaiDuAdAccount;
-use General\Models\Report\ReportUserBindRecord;
-use General\Models\User\User;
 use General\Services\Config\ConfigService;
 use General\Services\LandingPage\ChargeFeedBack\NormalChargeFeedBack;
 use General\Services\LandingPage\ChargeFeedBack\OrangeChargeFeedBack;
@@ -223,6 +220,7 @@ class LandingPageLinkService
             $date = substr($params['begin_time'],0,10);
             $sql->where('orders.created_at', '>=', $date. ' 00:00:00');
         }
+
         if (isset($params['end_time']) && $params['begin_time']) {
             $date = substr($params['end_time'],0,10);
             $sql->where('orders.created_at', '<=', $date. ' 23:59:59');
@@ -336,44 +334,7 @@ class LandingPageLinkService
 
     public function reReport(int $bind_id, float $amount, string $order_no, bool $is_qapp = false)
     {
-        if($is_qapp == true){
-            $service = $this->checkReport($bind_id,$is_qapp) ? new QappRereport : new Rereport;
-        }else{
-            $service = $is_qapp ? new QappRereport : new Rereport;
-        }
-
+        $service = $is_qapp ? new QappRereport : new Rereport;
         $service->reReport($bind_id, $amount, $order_no);
     }
-
-    /**
-     *
-     * @param $bind_id
-     * @param $is_qapp
-     * @return bool
-     */
-    protected function checkReport($bind_id,$is_qapp)
-    {
-        try {
-            //获取派单配置信息平台及版本信息
-            //非微博超粉返回true，微博超粉版本为0返回true
-            $report_user = ReportUserBindRecord::find($bind_id);
-            if($report_user){
-                if($report_user->platform != 'weibo'){
-                    return $is_qapp;
-                }
-                $qapp_send_order = User::leftjoin('qapp_send_orders','qapp_send_orders.send_order_id','users.send_order_id')
-                    ->where('users.id',$report_user->uid)
-                    ->select('qapp_send_orders.*')
-                    ->first();
-                if(isset($qapp_send_order->report_version) && $qapp_send_order->report_version == '1'){
-                    return false;
-                }
-                return $is_qapp;
-            }
-            return $is_qapp;
-        } catch (\Exception $e) {
-            \Log::info('weibo_chaofen_checkReport:error:'.$e->getMessage());
-        }
-
-    }
 }