gx

@@ -150,9 +150,25 @@ class InquiryInfoController extends BaseController
             'ip_area'=>'required',//
         ],[
             'ip_area.required' => '国家不能为空',
-
         ]);
         $info = $inquiryInfoLogic->getSearchIp();
         $this->response('success',Code::SUCCESS,$info);
     }
+
+    /**
+     * @remark :手动询盘转发
+     * @name   :forwardInquiry
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/14 10:43
+     */
+    public function forwardInquiry(InquiryInfoLogic $inquiryInfoLogic){
+        $this->request->validate([
+            'id'=>'required',//
+        ],[
+            'id.required' => 'id不能为空',
+        ]);
+        $inquiryInfoLogic->forwardTime($this->param['id']);
+        $this->response('success');
+    }
 }

@@ -7,8 +7,6 @@ use App\Models\InquiryIP;
 use App\Models\Projects\InquiryInfo;
 use App\Models\Projects\InquiryUser;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Artisan;
-use Illuminate\Console\Scheduling\Schedule;
 
 /**
  * @remark :询盘中心
@@ -52,9 +50,6 @@ class InquiryInfoLogic extends BaseLogic
      * @time   :2023/7/12 9:22
      */
     public function inquirySave(){
-        $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() + $this->param['delay'] * 60 * 60) ;
         $xp_id = $this->model->insertGetId($this->param);
         if(!$xp_id){
             $this->fail('error');
@@ -68,7 +63,7 @@ class InquiryInfoLogic extends BaseLogic
 
 
     /**
-     * @remark :逻辑删除
+     * @remark :删除
      * @name   :inquiryInfoDel
      * @author :lyh
      * @method :post
@@ -96,8 +91,7 @@ class InquiryInfoLogic extends BaseLogic
      * @time   :2023/7/12 17:43
      */
     public function inquiryForwardInfo(){
-        $inquiryUserModel = new InquiryUser();
-        $info = $inquiryUserModel->read(['xp_id'=>$this->param['id']]);
+        $info = $this->model->read(['id'=>$this->param['id']]);
         if($info === false){
             $this->fail('error');
         }
@@ -148,7 +142,6 @@ class InquiryInfoLogic extends BaseLogic
      * @time   :2023/7/13 17:39
      */
     public function forwardTime($xp_id){
-        $data = [];
         //获取数据详情
         $param = $this->model->read(['id'=>$xp_id]);
         if($param['delay'] == 0){
@@ -159,7 +152,11 @@ class InquiryInfoLogic extends BaseLogic
                 $this->inquiryForward($data);
             }
             //更新数据库,修改状态为已转发
-            $rs = $this->model->edit(['status'=>3],['id'=>$xp_id]);
+            $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');
             }

@@ -259,6 +259,7 @@ Route::group([], function () {
     Route::prefix('inquiry')->group(function () {
         Route::any('/', [Aside\Projects\InquiryInfoController::class, 'lists'])->name('admin.inquiry_lists');
         Route::any('/save', [Aside\Projects\InquiryInfoController::class, 'save'])->name('admin.inquiry_save');
+        Route::any('/forwardInquiry', [Aside\Projects\InquiryInfoController::class, 'forwardInquiry'])->name('admin.inquiry_forwardInquiry');
         Route::any('/forwardInfo', [Aside\Projects\InquiryInfoController::class, 'forwardInfo'])->name('admin.inquiry_forwardInfo');
         Route::any('/importInquirySave', [Aside\Projects\InquiryInfoController::class, 'importInquirySave'])->name('admin.inquiry_importInquirySave');
         Route::any('/getSearchIpInfo', [Aside\Projects\InquiryInfoController::class, 'getSearchIpInfo'])->name('admin.inquiry_getSearchIpInfo');