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

@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Aside\Optimize;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Optimize\InquiryForwardLogic;
 use App\Http\Logic\Aside\Optimize\InquiryForwardLogic;
-use Illuminate\Support\Facades\DB;
 
 
 class InquiryForwardController extends BaseController
 class InquiryForwardController extends BaseController
 {
 {
@@ -149,4 +148,25 @@ class InquiryForwardController extends BaseController
         $data = $inquiryForwardLogic->aiRewrite();
         $data = $inquiryForwardLogic->aiRewrite();
         $this->response('success', Code::SUCCESS, $data);
         $this->response('success', Code::SUCCESS, $data);
     }
     }
+
+    /**
+     * 设置询盘无效
+     * @param InquiryForwardLogic $inquiryForwardLogic
+     * @throws \App\Exceptions\AsideGlobalException
+     * @throws \App\Exceptions\BsideGlobalException
+     * @author Akun
+     * @date 2025/02/27 15:36
+     */
+    public function setInquiryExpired(InquiryForwardLogic $inquiryForwardLogic)
+    {
+        $this->request->validate([
+            'id' => 'required',
+        ], [
+            'id.required' => 'ID不能为空',
+        ]);
+
+        $inquiryForwardLogic->expiredInquiry();
+
+        $this->response('success');
+    }
 }
 }

@@ -115,7 +115,7 @@ class InquiryForwardLogic extends BaseLogic
             }
             }
 
 
             //更改询盘状态及转发数量
             //更改询盘状态及转发数量
-            $this->model->edit(['status' => 1, 'num' => $num], ['id' => $this->param['id']]);
+            $this->model->edit(['status' => InquiryInfo::STATUS_FINISH, 'num' => $num], ['id' => $this->param['id']]);
 
 
             DB::commit();
             DB::commit();
         } catch (\Exception $e) {
         } catch (\Exception $e) {
@@ -243,4 +243,22 @@ class InquiryForwardLogic extends BaseLogic
 
 
         return $this->success(['ai_message' => Common::deal_str($text)]);
         return $this->success(['ai_message' => Common::deal_str($text)]);
     }
     }
+
+    /**
+     * 设置询盘无效
+     * @return array
+     * @throws \App\Exceptions\AsideGlobalException
+     * @throws \App\Exceptions\BsideGlobalException
+     * @author Akun
+     * @date 2025/02/27 15:36
+     */
+    public function expiredInquiry()
+    {
+        $rs = $this->model->edit(['status' => InquiryInfo::STATUS_INVALID], ['id' => $this->param['id']]);
+
+        if ($rs === false) {
+            $this->fail('设置无效失败');
+        }
+        return $this->success();
+    }
 }
 }

@@ -348,6 +348,7 @@ Route::middleware(['aloginauth'])->group(function () {
         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');
         Route::any('/searchInquiryKeywords', [Aside\Optimize\InquiryForwardController::class, 'searchInquiryKeywords'])->name('admin.inquiry_forward_searchInquiryKeywords');
         Route::any('/searchInquiryKeywords', [Aside\Optimize\InquiryForwardController::class, 'searchInquiryKeywords'])->name('admin.inquiry_forward_searchInquiryKeywords');
         Route::any('/aiRewriteInquiry', [Aside\Optimize\InquiryForwardController::class, 'aiRewriteInquiry'])->name('admin.inquiry_forward_aiRewriteInquiry');
         Route::any('/aiRewriteInquiry', [Aside\Optimize\InquiryForwardController::class, 'aiRewriteInquiry'])->name('admin.inquiry_forward_aiRewriteInquiry');
+        Route::any('/setInquiryExpired', [Aside\Optimize\InquiryForwardController::class, 'setInquiryExpired'])->name('admin.inquiry_forward_setInquiryExpired');
     });
     });
 
 
     Route::prefix('custom_module')->group(function () {
     Route::prefix('custom_module')->group(function () {