Merge remote-tracking branch 'origin/master' into akun

@@ -352,7 +352,7 @@ class RelayInquiry extends Command
             // 随机访问1-6个页面
             // 随机访问1-6个页面
             $deep = rand(1,6);
             $deep = rand(1,6);
             if($deep > 2) {
             if($deep > 2) {
-                $visit_urls = Arr::random($all_urls, rand(1, count($all_urls) > 3 ? 3 : count($all_urls)));
+                $visit_urls = Arr::random($all_urls, rand(1, count($all_urls) > 4 ? 4 : count($all_urls)));
                 $urls = array_merge($urls, $visit_urls);
                 $urls = array_merge($urls, $visit_urls);
             }
             }
             if($deep > 1) {
             if($deep > 1) {

@@ -8,6 +8,7 @@ use App\Models\Inquiry\ReInquiryForm;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Redis;
 
 
 /**
 /**
  * Class postInquiry
  * Class postInquiry
@@ -50,6 +51,18 @@ class postInquiry extends Command
             }
             }
             // 询盘数据入库
             // 询盘数据入库
             foreach ($list as $key => $val) {
             foreach ($list as $key => $val) {
+                //加个锁 避免重复执行
+                $lockKey = 're_inquiry_detail_log_lock_' . $val->id;
+                if(!Redis::setnx($lockKey, 1)){
+                    continue;
+                }
+                Redis::expire($lockKey, 60);
+
+                $log = ReInquiryDetailLog::find($val->id);
+                if($log->status != ReInquiryDetailLog::STATUS_INIT){
+                    continue;
+                }
+                
                 $this->output('开始执行' . $val->id);
                 $this->output('开始执行' . $val->id);
                 try {
                 try {
                     $detail = ReInquiryDetail::find($val['detail_id']);
                     $detail = ReInquiryDetail::find($val['detail_id']);

@@ -150,9 +150,6 @@ class ComController extends BaseController
         if($uploadCode != 1){
         if($uploadCode != 1){
             $data[] = 41;
             $data[] = 41;
         }
         }
-        if(!empty($data)){
-            $this->map['id'] = ['not in',$data];
-        }
         $projectCode = $this->getProjectWatermark();
         $projectCode = $this->getProjectWatermark();
         if($projectCode != 1){
         if($projectCode != 1){
             $data[] = 50;
             $data[] = 50;
@@ -406,7 +403,7 @@ class ComController extends BaseController
      * @method :post
      * @method :post
      * @time   :2024/10/28 11:51
      * @time   :2024/10/28 11:51
      */
      */
-    public function month_count(){
+    public function month_counts(){
         Artisan::call('month_project '.$this->user['project_id']);
         Artisan::call('month_project '.$this->user['project_id']);
         $this->response('重新刷新中，请稍后刷新查询');
         $this->response('重新刷新中，请稍后刷新查询');
     }
     }

@@ -21,6 +21,8 @@ Route::middleware(['bloginauth'])->group(function () {
     Route::any('/getLink', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getLink'])->name('getLink');
     Route::any('/getLink', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getLink'])->name('getLink');
     Route::any('/getMobileProject', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getMobileProject'])->name('getMobileProject');
     Route::any('/getMobileProject', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getMobileProject'])->name('getMobileProject');
     Route::any('/getNoticeInfo', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getNoticeInfo'])->name('getNoticeInfo');
     Route::any('/getNoticeInfo', [\App\Http\Controllers\Bside\BCom\ComController::class, 'getNoticeInfo'])->name('getNoticeInfo');
+    //重新校队流量统计
+    Route::any('/month_counts', [\App\Http\Controllers\Bside\BCom\ComController::class, 'month_counts'])->name('month_counts');
     //黑格数据
     //黑格数据
     Route::prefix('suppliers')->group(function () {
     Route::prefix('suppliers')->group(function () {
         Route::any('/recommendedPurchaser', [\App\Http\Controllers\Bside\Suppliers\SuppliersController::class, 'recommendedPurchaser'])->name('suppliers_recommendedPurchaser');
         Route::any('/recommendedPurchaser', [\App\Http\Controllers\Bside\Suppliers\SuppliersController::class, 'recommendedPurchaser'])->name('suppliers_recommendedPurchaser');