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

@@ -43,7 +43,7 @@ class RemainDay extends Command
      * @var 暂停的项目
      * @var 暂停的项目
      */
      */
     protected $ceaseProjectId = [
     protected $ceaseProjectId = [
-        354, 378, 649, 1226, 1283, 1703, 1893, 2066, 2250, 2193, 2399, 1685, 3931,2273,3647
+        354, 378, 649, 1226, 1283, 1703, 1893, 2066, 2250, 2193, 2399, 1685, 3931,2273,3647,1934
     ];//需要单独处理的项目
     ];//需要单独处理的项目
     /**
     /**
      * The console command description.
      * The console command description.

@@ -208,7 +208,7 @@ class ProjectLogic extends BaseLogic
                 $this->fail('保存失败，请联系管理员');
                 $this->fail('保存失败，请联系管理员');
             }
             }
         }
         }
-        return $this->success();
+        return $this->success($this->param);
     }
     }
 
 
     /**
     /**
@@ -440,7 +440,7 @@ class ProjectLogic extends BaseLogic
             foreach ($param['payment']['renewal_record'] as &$record) {
             foreach ($param['payment']['renewal_record'] as &$record) {
                 if (!is_null($record['expire_at'] ?? null) && $record['expire_at'] === $maxExpireAt) {
                 if (!is_null($record['expire_at'] ?? null) && $record['expire_at'] === $maxExpireAt) {
                     // 如果 end_time 不存在或与 expire_at 不一致，则更新
                     // 如果 end_time 不存在或与 expire_at 不一致，则更新
-                    if (!isset($record['end_time']) || $record['end_time'] != $record['expire_at']) {
+                    if (!isset($record['end_time']) || ($record['end_time'] != $record['expire_at'])) {
                         $record['end_time'] = $record['expire_at']; // ✅ 写回原数据
                         $record['end_time'] = $record['expire_at']; // ✅ 写回原数据
                         // 重新计算剩余天数
                         // 重新计算剩余天数
                         $diff = (strtotime($record['expire_at']) - strtotime(date('Y-m-d'))) / (60 * 60 * 24);
                         $diff = (strtotime($record['expire_at']) - strtotime(date('Y-m-d'))) / (60 * 60 * 24);

@@ -555,7 +555,7 @@ class RankDataLogic extends BaseLogic
         $without_extension_project_ids = [658]; //是否达标只统计主词的
         $without_extension_project_ids = [658]; //是否达标只统计主词的
         $extension_project_ids = [354]; //扩展词也到达标的
         $extension_project_ids = [354]; //扩展词也到达标的
         $compliance_project_ids = [2163,257,823,1750,497,1006]; //直接达标处理的
         $compliance_project_ids = [2163,257,823,1750,497,1006]; //直接达标处理的
-        $ceaseProjectId = [354, 378, 649, 1226, 1283, 1703, 1893, 2066, 2250,2193,2399,1685, 3931,2273,3647];//暂停的项目
+        $ceaseProjectId = [354, 378, 649, 1226, 1283, 1703, 1893, 2066, 2250,2193,2399,1685, 3931,2273,3647,1934];//暂停的项目
         $uptimeProjectId = [1434,1812,276,2414,2974];//按上线时间统计的项目
         $uptimeProjectId = [1434,1812,276,2414,2974];//按上线时间统计的项目
         //一个项目多个api_no
         //一个项目多个api_no
         $multiple_api_no_project_ids = [
         $multiple_api_no_project_ids = [

@@ -463,7 +463,33 @@ class SyncSubmitTaskService
         ){
         ){
             throw new InquiryFilterException( '全局过滤');
             throw new InquiryFilterException( '全局过滤');
         }
         }
+        //全局过滤 ip 荷兰 有name、phone、email字段，但都是空
+        if(
+            in_array($data['country'], ['荷兰', '俄罗斯']) &&
+            isset($data['data']['name']) &&
+            isset($data['data']['phone']) &&
+            isset($data['data']['email']) &&
+            empty($data['data']['name']) &&
+            empty($data['data']['phone']) &&
+            empty($data['data']['email'])
+        ){
+            throw new InquiryFilterException( '全局过滤');
+        }
 
 
+        //数据都是空的
+        $is_all_empty = true;
+        foreach ($data['data'] as $item){
+            if(Str::startsWith(strtolower($item),'globalso-')){
+                continue;
+            }
+            if(!empty($item)){
+                $is_all_empty = false;
+                break;
+            }
+        }
+        if($is_all_empty){
+            throw new InquiryFilterException( '数据都是空的');
+        }
 
 
         $config = InquiryFilterConfig::getCacheInfoByProjectId($project_id);
         $config = InquiryFilterConfig::getCacheInfoByProjectId($project_id);
         //没配置 则默认开启且使用全局
         //没配置 则默认开启且使用全局