Merge remote-tracking branch 'origin/master' into akun

@@ -87,9 +87,6 @@ class postInquiry extends Command
 
 
                     if($val['type'] == 1){
                     if($val['type'] == 1){
                         $this->visit($detail, $val);
                         $this->visit($detail, $val);
-                    }else{
-                        $this->inquiry($detail, $val);
-                    }
 
 
                         $init_num = ReInquiryDetailLog::where('detail_id', $val['detail_id'])->where('status', ReInquiryDetailLog::STATUS_INIT)->count();
                         $init_num = ReInquiryDetailLog::where('detail_id', $val['detail_id'])->where('status', ReInquiryDetailLog::STATUS_INIT)->count();
                         if(!$init_num){
                         if(!$init_num){
@@ -97,12 +94,22 @@ class postInquiry extends Command
                             $detail->status = ReInquiryDetail::STATUS_SUCCESS;
                             $detail->status = ReInquiryDetail::STATUS_SUCCESS;
                             $detail->result = $val['url'];
                             $detail->result = $val['url'];
                             $detail->save();
                             $detail->save();
+                        }
+                    }else{
+                        $res = $this->inquiry($detail, $val);
+
+                        //转发详情
+                        $detail->status = $res ? ReInquiryDetail::STATUS_SUCCESS : ReInquiryDetail::STATUS_FAIL;
+                        $detail->result = $val['url'];
+                        $detail->save();
                         //转发表单
                         //转发表单
+                        if($res){
                             $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, getmypid()]);
                             Log::channel('inquiry_relay')->info('询盘成功：',[$detail['form_id'], $val->id, getmypid()]);
                         }
                         }
+                    }
                 }catch (\Exception $e){
                 }catch (\Exception $e){
                     Log::channel('inquiry_relay')->error('inquiry_relay handle error', [$e->getMessage(), $e->getFile(), $e->getLine()]);
                     Log::channel('inquiry_relay')->error('inquiry_relay handle error', [$e->getMessage(), $e->getFile(), $e->getLine()]);