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

@@ -9,7 +9,7 @@ use App\Http\Logic\Aside\Optimize\InquiryForwardLogic;
 class InquiryForwardController extends BaseController
 class InquiryForwardController extends BaseController
 {
 {
     /**
     /**
-     * 获取询信息发列表
+     * 获取询盘列表
      * @param InquiryForwardLogic $inquiryForwardLogic
      * @param InquiryForwardLogic $inquiryForwardLogic
      * @author Akun
      * @author Akun
      * @date 2025/02/21 10:55
      * @date 2025/02/21 10:55
@@ -33,6 +33,24 @@ class InquiryForwardController extends BaseController
     }
     }
 
 
     /**
     /**
+     * 获取询盘详情
+     * @param InquiryForwardLogic $inquiryForwardLogic
+     * @throws \App\Exceptions\AsideGlobalException
+     * @throws \App\Exceptions\BsideGlobalException
+     * @author Akun
+     * @date 2025/03/01 11:21
+     */
+    public function getInquiryInfo(InquiryForwardLogic $inquiryForwardLogic){
+        $this->request->validate([
+            'id'=>'required',
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
+        $info = $inquiryForwardLogic->infoInquiry();
+        $this->response('success',Code::SUCCESS,$info);
+    }
+
+    /**
      * 获取询盘类型
      * 获取询盘类型
      * @param InquiryForwardLogic $inquiryForwardLogic
      * @param InquiryForwardLogic $inquiryForwardLogic
      * @author Akun
      * @author Akun

@@ -34,7 +34,7 @@ class InquiryForwardLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * 获取类型
+     * 获取询盘类型
      * @return array
      * @return array
      * @author Akun
      * @author Akun
      * @date 2025/02/21 11:19
      * @date 2025/02/21 11:19
@@ -53,7 +53,7 @@ class InquiryForwardLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * 获取列表
+     * 获取询盘列表
      * @param $map
      * @param $map
      * @param $page
      * @param $page
      * @param $row
      * @param $row
@@ -70,6 +70,23 @@ class InquiryForwardLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * 获取询盘详情
+     * @return array
+     * @throws \App\Exceptions\AsideGlobalException
+     * @throws \App\Exceptions\BsideGlobalException
+     * @author Akun
+     * @date 2025/03/01 11:20
+     */
+    public function infoInquiry()
+    {
+        $info = $this->model->read(['id' => $this->param['id']], ['id', 'url', 'url_title', 'url_keyword', 'name', 'email', 'phone', 'ip', 'country', 'message']);
+        if ($info === false) {
+            $this->fail('获取询盘详情失败');
+        }
+        return $this->success($info);
+    }
+
+    /**
      * 转发询盘
      * 转发询盘
      * @return array
      * @return array
      * @throws \App\Exceptions\AsideGlobalException
      * @throws \App\Exceptions\AsideGlobalException

@@ -8,14 +8,14 @@
 
 
 namespace App\Models\Inquiry;
 namespace App\Models\Inquiry;
 
 
-use Illuminate\Database\Eloquent\Model;
+use App\Models\Base;
 
 
 /**
 /**
  * 转发详情日志
  * 转发详情日志
  * Class ReInquiryDetailLog
  * Class ReInquiryDetailLog
  * @package App\Models\Inquiry
  * @package App\Models\Inquiry
  */
  */
-class InquiryRelayDetailLog extends Model
+class InquiryRelayDetailLog extends Base
 {
 {
     /**
     /**
      * @var string
      * @var string

@@ -342,7 +342,8 @@ Route::middleware(['aloginauth'])->group(function () {
 
 
     //手动转发询盘
     //手动转发询盘
     Route::prefix('inquiry_forward')->group(function () {
     Route::prefix('inquiry_forward')->group(function () {
-        Route::any('/', [Aside\Optimize\InquiryForwardController::class, 'lists'])->name('admin.inquiry_lists');
+        Route::any('/', [Aside\Optimize\InquiryForwardController::class, 'lists'])->name('admin.inquiry_forward_lists');
+        Route::any('/getInquiryInfo', [Aside\Optimize\InquiryForwardController::class, 'getInquiryInfo'])->name('admin.inquiry_forward_getInquiryInfo');
         Route::any('/getInquiryType', [Aside\Optimize\InquiryForwardController::class, 'getInquiryType'])->name('admin.inquiry_forward_getInquiryType');
         Route::any('/getInquiryType', [Aside\Optimize\InquiryForwardController::class, 'getInquiryType'])->name('admin.inquiry_forward_getInquiryType');
         Route::any('/forwardInquiry', [Aside\Optimize\InquiryForwardController::class, 'forwardInquiry'])->name('admin.inquiry_forward_forwardInquiry');
         Route::any('/forwardInquiry', [Aside\Optimize\InquiryForwardController::class, 'forwardInquiry'])->name('admin.inquiry_forward_forwardInquiry');
         Route::any('/getInquiryIp', [Aside\Optimize\InquiryForwardController::class, 'getInquiryIp'])->name('admin.inquiry_forward_getInquiryIp');
         Route::any('/getInquiryIp', [Aside\Optimize\InquiryForwardController::class, 'getInquiryIp'])->name('admin.inquiry_forward_getInquiryIp');
@@ -534,7 +535,7 @@ Route::group([], function () {
     Route::any('/getProjectInService', [Aside\Project\ProjectController::class, 'getProjectInService'])->name('admin.getProjectInService');//获取项目服务状态
     Route::any('/getProjectInService', [Aside\Project\ProjectController::class, 'getProjectInService'])->name('admin.getProjectInService');//获取项目服务状态
     Route::any('/getProjectByChannel', [Aside\Project\ProjectController::class, 'getProjectByChannel'])->name('admin.getProjectByChannel');//获取渠道商的项目
     Route::any('/getProjectByChannel', [Aside\Project\ProjectController::class, 'getProjectByChannel'])->name('admin.getProjectByChannel');//获取渠道商的项目
     // 提供接口 同步人事信息到5.0后台
     // 提供接口 同步人事信息到5.0后台
-    Route::any('/get_hr_list', [Aside\Manage\HrController::class , 'getHrList'])->name('admin.get_hr_list');
+    Route::any('/get_hr_list', [Aside\Manage\HrController::class, 'getHrList'])->name('admin.get_hr_list');
     // 提供模板 提单后台查看
     // 提供模板 提单后台查看
     Route::any('get_template_list', [Aside\Template\ATemplateController::class, 'getTemplateList'])->name('admin.get_template_list');
     Route::any('get_template_list', [Aside\Template\ATemplateController::class, 'getTemplateList'])->name('admin.get_template_list');
     Route::any('get_template_detail', [Aside\Template\ATemplateController::class, 'getTemplateDetail'])->name('admin.get_template_detail');
     Route::any('get_template_detail', [Aside\Template\ATemplateController::class, 'getTemplateDetail'])->name('admin.get_template_detail');