Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -169,7 +169,6 @@ class RelayInquiry extends Command
         while (true) {
         while (true) {
             $inquiry = $this->getInquiry();
             $inquiry = $this->getInquiry();
             if ($inquiry->isEmpty()){
             if ($inquiry->isEmpty()){
-                $this->logChannel()->info('未发现待处理询盘！');
                 $this->output('未发现待处理询盘！');
                 $this->output('未发现待处理询盘！');
                 sleep(60);
                 sleep(60);
                 continue;
                 continue;

@@ -67,6 +67,7 @@ class postInquiry extends Command
                             $form = ReInquiryForm::find($detail['form_id']);
                             $form = ReInquiryForm::find($detail['form_id']);
                             $form->success_num = $form->success_num + 1;
                             $form->success_num = $form->success_num + 1;
                             $form->save();
                             $form->save();
+                            Log::channel('inquiry_relay')->info($detail['form_id'] . '询盘成功' .  $val->id);
                         }
                         }
                     }
                     }
                 }catch (\Exception $e){
                 }catch (\Exception $e){
@@ -176,6 +177,10 @@ class postInquiry extends Command
             ];
             ];
 
 
             $res = Http::withoutVerifying()->post('https://form.globalso.com/api/external-interface/add/fa043f9cbec6b38f', $data)->json();
             $res = Http::withoutVerifying()->post('https://form.globalso.com/api/external-interface/add/fa043f9cbec6b38f', $data)->json();
+            //兼容接口返回格式
+            if(!empty($res['data'][0]['status'])){
+                $res['data'][0]['code'] = $res['data'][0]['status'] == 'success' ? 200 : 400;
+            }
             if(empty($res['data'][0]['code']) || !in_array($res['data'][0]['code'], [200,300])){
             if(empty($res['data'][0]['code']) || !in_array($res['data'][0]['code'], [200,300])){
                 $log->status = ReInquiryDetailLog::STATUS_FAIL;
                 $log->status = ReInquiryDetailLog::STATUS_FAIL;
                 $log->remark = $res['message'] ?? '';
                 $log->remark = $res['message'] ?? '';

@@ -59,8 +59,9 @@ class AdsController extends BaseController
             ->paginate($page_size);
             ->paginate($page_size);
 
 
         $relay_site_total = 0;
         $relay_site_total = 0;
-        foreach ($result as $item){
+        foreach ($result as &$item){
             $relay_site_total += count($item->target);
             $relay_site_total += count($item->target);
+            $item->requiry_num = ReInquiryDetail::where('task_id', $item->id)->where('status', ReInquiryDetail::STATUS_SUCCESS)->count();
         }
         }
         $result = $result->toArray();
         $result = $result->toArray();
         $result['relay_site_total'] = $relay_site_total;
         $result['relay_site_total'] = $relay_site_total;