gx

@@ -37,7 +37,7 @@ class InquiryDelay extends Command
     public function handle()
     public function handle()
     {
     {
         $inquiryInfoModel = new InquiryInfo();
         $inquiryInfoModel = new InquiryInfo();
-        $param = $inquiryInfoModel->formatQuery(['status'=>0,'delay'=>['!=',0]])->orderBy('send_time','asc')->first();
+        $param = $inquiryInfoModel->formatQuery(['status'=>$inquiryInfoModel::STATUS_FOUR])->orderBy('send_time','asc')->first();
         if($param !== false){
         if($param !== false){
             $time = date('Y-m-d H:i:s');
             $time = date('Y-m-d H:i:s');
             if($time >= $param['send_time']){
             if($time >= $param['send_time']){
@@ -48,7 +48,7 @@ class InquiryDelay extends Command
                     $data['url'] = $v;
                     $data['url'] = $v;
                     $this->inquiryForward($data);
                     $this->inquiryForward($data);
                 }
                 }
-                $inquiryInfoModel->edit(['status'=>1],['id'=>$param['id']]);
+                $inquiryInfoModel->edit(['status'=>$inquiryInfoModel::STATUS_THREE],['id'=>$param['id']]);
             }
             }
         }
         }
         return true;
         return true;

@@ -48,11 +48,12 @@ class InquiryInfoLogic extends BaseLogic
      * @time   :2023/7/12 9:22
      * @time   :2023/7/12 9:22
      */
      */
     public function inquirySave(){
     public function inquirySave(){
-        $this->param['created_at'] = date('Y-m-d H:i:s');
-        $this->param['updated_at'] = date('Y-m-d H:i:s');
         if($this->param['delay'] != $this->model::STATUS_ZERO){
         if($this->param['delay'] != $this->model::STATUS_ZERO){
             $this->param['status'] = $this->model::STATUS_FOUR;//延时转发
             $this->param['status'] = $this->model::STATUS_FOUR;//延时转发
+            $this->param['send_time'] = date('Y-m-d H:i:s',time() + $this->param['delay'] * 60 * 60);//实际转发时间
         }
         }
+        $this->param['created_at'] = date('Y-m-d H:i:s');
+        $this->param['updated_at'] = $this->param['created_at'];
         $xp_id = $this->model->insertGetId($this->param);
         $xp_id = $this->model->insertGetId($this->param);
         if(!$xp_id){
         if(!$xp_id){
             $this->fail('error');
             $this->fail('error');
@@ -147,22 +148,20 @@ class InquiryInfoLogic extends BaseLogic
     public function forwardTime($xp_id){
     public function forwardTime($xp_id){
         //获取数据详情
         //获取数据详情
         $param = $this->model->read(['id'=>$xp_id]);
         $param = $this->model->read(['id'=>$xp_id]);
-        if($param['delay'] == 0){
-            $data = $param;
-            $arr_url = explode(',',$param['forward_url']);
-            foreach ($arr_url as $v){
-                $data['url'] = $v;
-                $this->inquiryForward($data);
-            }
-            //更新数据库,修改状态为已转发
-            $this->param['status'] = 3;
-            $this->param['user_id'] = $this->manager['id'];
-            $this->param['user_name'] = $this->manager['name'];
-            $this->param['send_time'] = date('Y-m-d H:i:s',time() + $param['delay'] * 60 * 60) ;
-            $rs = $this->model->edit($this->param,['id'=>$xp_id]);
-            if($rs === false){
-                $this->fail('error');
-            }
+        $data = $param;
+        $arr_url = explode(',',$param['forward_url']);
+        foreach ($arr_url as $v){
+            $data['url'] = $v;
+            $this->inquiryForward($data);
+        }
+        //更新数据库,修改状态为已转发
+        $this->param['status'] = 3;
+        $this->param['user_id'] = $this->manager['id'];
+        $this->param['user_name'] = $this->manager['name'];
+        $this->param['send_time'] = date('Y-m-d H:i:s');
+        $rs = $this->model->edit($this->param,['id'=>$xp_id]);
+        if($rs === false){
+            $this->fail('error');
         }
         }
         return $this->success();
         return $this->success();
     }
     }