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

@@ -7,6 +7,7 @@ use App\Helper\Translate;
 use App\Models\Product\Category;
 use App\Models\Product\Category;
 use App\Models\Product\CategoryRelated;
 use App\Models\Product\CategoryRelated;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
+use App\Models\Project\ProjectAiSetting;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Services\CosService;
 use App\Services\CosService;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
@@ -251,4 +252,30 @@ class ProductController extends BaseController
 
 
         return $suggestions;
         return $suggestions;
     }
     }
+
+    /**
+     * 搜索给AI博客 产品推荐用
+     * 全文搜索 产品标题
+     * @author zbj
+     * @date 2025/5/8
+     */
+    public function searchProductToAiBlog(Request $request){
+        $mch_id = $request->input('mch_id');
+        $key = $request->input('key');
+        $keyword = $request->input('keyword');
+
+        if(!$keyword){
+            $this->response('关键词不能为空', Code::SYSTEM_ERROR);
+        }
+        $project_id = ProjectAiSetting::where('mch_id', $mch_id)->where('key', $key)->value('project_id');
+        if(!$project_id){
+            $this->response('项目不存在', Code::SYSTEM_ERROR);
+        }
+        
+        ProjectServer::useProject($project_id);
+
+        $product = Product::whereFullText('title', $keyword)->inRandomOrder()->select(['title', 'intro', 'thumb'])->first();
+
+        $this->response('success', Code::SUCCESS, $product?:[]);
+    }
 }
 }

@@ -286,9 +286,9 @@ class SyncSubmitTaskService
         //转化询盘
         //转化询盘
         Visit::isInquiry($data['ip']);
         Visit::isInquiry($data['ip']);
 
 
-        //推送企微消息
+        //推送企微消息 测试域名不发
         Log::channel('inquiry')->info($task_id . '询盘结果', [$id]);
         Log::channel('inquiry')->info($task_id . '询盘结果', [$id]);
-        if($id){
+        if($id && !Str::contains($data['domain'], 'globalso.site')){
             try {
             try {
                 $name = empty($data['data']['name']) ? '' : ' ' . $data['data']['name'];
                 $name = empty($data['data']['name']) ? '' : ' ' . $data['data']['name'];
                 MessagePush::addInquiryMessage($id, $data['project_id'], $data['country'], $name, $data['submit_at']);
                 MessagePush::addInquiryMessage($id, $data['project_id'], $data['country'], $name, $data['submit_at']);

@@ -18,7 +18,6 @@
         "laravel/framework": "^8.75",
         "laravel/framework": "^8.75",
         "laravel/sanctum": "^2.11",
         "laravel/sanctum": "^2.11",
         "laravel/tinker": "^2.5",
         "laravel/tinker": "^2.5",
-        "mongodb/mongodb": "^1.6",
         "mrgoon/aliyun-sms": "^2.0",
         "mrgoon/aliyun-sms": "^2.0",
         "phpoffice/phpspreadsheet": "^1.28",
         "phpoffice/phpspreadsheet": "^1.28",
         "qcloud/cos-sdk-v5": "^v2.6.6",
         "qcloud/cos-sdk-v5": "^v2.6.6",

@@ -24,6 +24,7 @@ Route::get('get_project_route', [\App\Http\Controllers\Api\PrivateController::cl
 Route::any('get_product_images', [\App\Http\Controllers\Api\ProductController::class, 'getImages'])->name('api.get_product_images');
 Route::any('get_product_images', [\App\Http\Controllers\Api\ProductController::class, 'getImages'])->name('api.get_product_images');
 Route::any('saveProduct', [\App\Http\Controllers\Api\ProductController::class, 'saveProduct'])->name('api.saveProduct');
 Route::any('saveProduct', [\App\Http\Controllers\Api\ProductController::class, 'saveProduct'])->name('api.saveProduct');
 Route::any('searchProduct', [\App\Http\Controllers\Api\ProductController::class, 'searchProduct'])->name('api.searchProduct');
 Route::any('searchProduct', [\App\Http\Controllers\Api\ProductController::class, 'searchProduct'])->name('api.searchProduct');
+Route::any('searchProductToAiBlog', [\App\Http\Controllers\Api\ProductController::class, 'searchProductToAiBlog'])->name('api.searchProductToAiBlog');
 Route::post('inquiry_submit', [\App\Http\Controllers\Api\InquiryController::class, 'submit'])->name('api.inquiry_submit');
 Route::post('inquiry_submit', [\App\Http\Controllers\Api\InquiryController::class, 'submit'])->name('api.inquiry_submit');
 Route::post('editInquiryStatus', [\App\Http\Controllers\Api\InquiryController::class, 'editInquiryStatus'])->name('api.inquiry_editInquiryStatus');
 Route::post('editInquiryStatus', [\App\Http\Controllers\Api\InquiryController::class, 'editInquiryStatus'])->name('api.inquiry_editInquiryStatus');
 Route::any('get_inquiry_random_ip', [\App\Http\Controllers\Api\InquiryController::class, 'getRandomIp'])->name('api.inquiry_getRandomIp');
 Route::any('get_inquiry_random_ip', [\App\Http\Controllers\Api\InquiryController::class, 'getRandomIp'])->name('api.inquiry_getRandomIp');