update

@@ -197,7 +197,10 @@ class RelayInquiry extends Command
                     continue;
                     continue;
                 }
                 }
                 // 未设置对法对象
                 // 未设置对法对象
-                if (empty($ad_task['target'])) {
+                $target_num_arr = array_map(function ($item) {
+                    return count($item['target']);
+                }, $ad_task);
+                if (!array_sum($target_num_arr)) {
                     $val->status = ReInquiryForm::STATUS_FORGO;
                     $val->status = ReInquiryForm::STATUS_FORGO;
                     $val->remark = '广告任务转发对象为空！';
                     $val->remark = '广告任务转发对象为空！';
                     $val->save();
                     $val->save();
@@ -213,7 +216,12 @@ class RelayInquiry extends Command
                 }
                 }
 
 
                 try {
                 try {
-                    $this->relayDetail($ad_task, $val);
+                    $res = false;
+                    foreach ($ad_task as $task){
+                        $res += $this->relayDetail($task, $val);
+                    }
+                    $val->status = $res ? ReInquiryForm::STATUS_SUCCESS : ReInquiryForm::STATUS_FORGO;
+                    $val->save();
                 } catch (\Exception $e) {
                 } catch (\Exception $e) {
                     $this->logChannel()->info('执行询盘错误：' . $e->getMessage());
                     $this->logChannel()->info('执行询盘错误：' . $e->getMessage());
                     $this->output('执行询盘错误：' . $e->getMessage());
                     $this->output('执行询盘错误：' . $e->getMessage());
@@ -294,9 +302,7 @@ class RelayInquiry extends Command
 
 
         if (empty($random_data)) {
         if (empty($random_data)) {
             $this->logChannel()->info('当前任务未发现转发对象！', ['广告任务ID：' . $task['id'], '询盘ID：' . $form->id]);
             $this->logChannel()->info('当前任务未发现转发对象！', ['广告任务ID：' . $task['id'], '询盘ID：' . $form->id]);
-            $form->status = ReInquiryForm::STATUS_FORGO;
-            $form->remark = '当前任务未发现转发对象，广告ID: ' . $form->ad_id . '！';
-            $form->save();
+            $form->remark = $form->remark . '当前任务未发现转发对象，广告ID: ' . $form->ad_id . '！';
             return false;
             return false;
         }
         }
 
 
@@ -444,9 +450,6 @@ class RelayInquiry extends Command
                 }
                 }
             }
             }
         }
         }
-
-        $form->status = ReInquiryForm::STATUS_SUCCESS;
-        $form->save();
         return true;
         return true;
     }
     }
 
 
@@ -468,12 +471,15 @@ class RelayInquiry extends Command
      */
      */
     public function getAdTask($ad_id)
     public function getAdTask($ad_id)
     {
     {
-        $cache_key = 'inquiry_ads_task';
+        $cache_key = 'inquiry_ads_tasks';
         $ads = Cache::get($cache_key, function () use ($cache_key) {
         $ads = Cache::get($cache_key, function () use ($cache_key) {
             $ads = ReInquiryTask::where(['status' => ReInquiryTask::STATUS_OPEN])->get(['id', 'ad_id', 'num', 'target', 'is_replace_text', 'ai_param']);
             $ads = ReInquiryTask::where(['status' => ReInquiryTask::STATUS_OPEN])->get(['id', 'ad_id', 'num', 'target', 'is_replace_text', 'ai_param']);
             $array = [];
             $array = [];
             foreach ($ads as $key=>$val) {
             foreach ($ads as $key=>$val) {
-                $array[$val->ad_id] = $val;
+               $ad_ids = explode(',', $val['ad_id']);
+               foreach ($ad_ids as $ad_id){
+                   $array[$ad_id][] = $val;
+               }
             }
             }
             if ($array)
             if ($array)
                 Cache::put($cache_key, $array, 60);
                 Cache::put($cache_key, $array, 60);

@@ -180,13 +180,14 @@ class AdsController extends BaseController
             return $this->response($res['msg'] ?? '验证失败，请稍后再试！', Code::USER_ERROR, []);
             return $this->response($res['msg'] ?? '验证失败，请稍后再试！', Code::USER_ERROR, []);
         }
         }
 
 
-        $agent = implode(',', array_map(function ($v){
-            return trim(explode('-', $v)[0]);
-        }, explode(',', $res['data'] ?? '')));
+//        $agent = implode(',', array_map(function ($v){
+//            return trim(explode('-', $v)[0]);
+//        }, explode(',', $res['data'] ?? '')));
 
 
         $data = [
         $data = [
             'is_v6' => 0,
             'is_v6' => 0,
-            'agent' => $agent,
+            'agent' => $res['data'],
+            'agent_group' => trim(explode('-', $res['data'])[0]),
             'domain' => $domain,
             'domain' => $domain,
         ];
         ];
         return $this->response('success', Code::SUCCESS, $data);
         return $this->response('success', Code::SUCCESS, $data);