合并分支 'zhl' 到 'master'

询盘通知微信提示 调试完成



查看合并请求 !919

@@ -172,12 +172,13 @@ class NoticeController extends BaseController
     }
 
     /**
+     * 询盘通知企业微信群提示hook
      * 升级项目询盘hook
      * 通知发送群提醒
      * @param Request $request
      * @return false|string
      */
-    public function upgradeProjectInquiryHook(Request $request)
+    public function inquiryNoticeHook(Request $request)
     {
         $domain = trim($request->input('domain'));
         $country = trim($request->input('country'));

@@ -343,9 +343,10 @@ class PrivateController extends BaseController
     public function upgradeProjectDomain()
     {
         $domain = Project::leftJoin('gl_domain_info', 'gl_project.id', '=', 'gl_domain_info.project_id')
-            ->where(['gl_project.is_upgrade' => Project::IS_UPGRADE_TRUE, 'gl_project.delete_status' => Project::IS_DEL_FALSE, ''])
+            ->where(['gl_project.is_upgrade' => Project::IS_UPGRADE_TRUE, 'gl_project.delete_status' => Project::IS_DEL_FALSE])
             ->pluck('domain')
             ->toArray();
-        return $this->success($domain);
+        $list = array_filter(array_unique($domain));
+        return $this->success($list);
     }
 }

@@ -41,7 +41,10 @@ Route::any('getAutoToken', [\App\Http\Controllers\Api\PrivateController::class,
 Route::any('valid_product_route', [\App\Http\Controllers\Api\PrivateController::class, 'getProductRoute'])->name('api.valid_product_route');
 // 6.0项目新增有效链接 - 提交Google
 Route::any('project_new_url', [\App\Http\Controllers\Api\PrivateController::class, 'projectNewUrl'])->name('api.project_new_url');
-
+// 6.0升级项目域名列表
+Route::any('upgrade_project_domain', [\App\Http\Controllers\Api\PrivateController::class, 'upgradeProjectDomain'])->name('api.upgrade_project_domain');
+// 询盘通知微信提示hook
+Route::any('inquiry_notice_hook', [\App\Http\Controllers\Api\NoticeController::class, 'inquiryNoticeHook'])->name('api.inquiry_notice_hook');
 
 // --------------------- 站群服务 ------------------------------------------
 // 获取项目信息