周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 94e44a84b2ea34457b6d66ac69e3ba64b03f29cf 1 个父辈 46ef00a8

update

内嵌 并排对比
正在显示 2 个修改的文件 包含 5 行增加 和 4 行删除
@@ -71,7 +71,7 @@ class DomainInfo extends Command @@ -71,7 +71,7 @@ class DomainInfo extends Command
71 $serverIpModel = new ServersIp(); 71 $serverIpModel = new ServersIp();
72 $list = $domainModel->where('status', '=', 1)->get(); 72 $list = $domainModel->where('status', '=', 1)->get();
73 foreach ($list as $v) { 73 foreach ($list as $v) {
74 - $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']); 74 + $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id']);
75 if (!$project_info) { 75 if (!$project_info) {
76 continue; 76 continue;
77 } 77 }
@@ -142,7 +142,7 @@ class DomainInfo extends Command @@ -142,7 +142,7 @@ class DomainInfo extends Command
142 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期 142 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
143 $list = $domainModel->where('status', '=', 1)->where('type', '!=', 2)->where('certificate_end_time', '<', $end_day)->get()->toArray(); 143 $list = $domainModel->where('status', '=', 1)->where('type', '!=', 2)->where('certificate_end_time', '<', $end_day)->get()->toArray();
144 foreach ($list as $v) { 144 foreach ($list as $v) {
145 - $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']); 145 + $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id']);
146 if (!$project_info) { 146 if (!$project_info) {
147 continue; 147 continue;
148 } 148 }
@@ -199,7 +199,7 @@ class DomainInfo extends Command @@ -199,7 +199,7 @@ class DomainInfo extends Command
199 } 199 }
200 $amp_domain = implode('.', $host_array); 200 $amp_domain = implode('.', $host_array);
201 201
202 - $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']); 202 + $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id']);
203 if (!$project_info) { 203 if (!$project_info) {
204 continue; 204 continue;
205 } 205 }
@@ -246,7 +246,7 @@ class DomainInfo extends Command @@ -246,7 +246,7 @@ class DomainInfo extends Command
246 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期 246 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
247 $list = $customModel->where('status', 1)->where('is_create', 1)->where('type', '!=', 2)->where('certificate_end_time', '<', $end_day)->get()->toArray(); 247 $list = $customModel->where('status', 1)->where('is_create', 1)->where('type', '!=', 2)->where('certificate_end_time', '<', $end_day)->get()->toArray();
248 foreach ($list as $v) { 248 foreach ($list as $v) {
249 - $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']); 249 + $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id']);
250 if (!$project_info) { 250 if (!$project_info) {
251 continue; 251 continue;
252 } 252 }
@@ -29,6 +29,7 @@ class Project extends Base @@ -29,6 +29,7 @@ class Project extends Base
29 const TYPE_FIVE = 5;//未续费网站 29 const TYPE_FIVE = 5;//未续费网站
30 const TYPE_SIX = 6;//特殊推广项目 30 const TYPE_SIX = 6;//特殊推广项目
31 const TYPE_SEVEN = 7;//错误单 31 const TYPE_SEVEN = 7;//错误单
  32 + const TYPE_CLOSE = 8;//关闭项目
32 const MYSQL_ID = 2;//默认数据库id 33 const MYSQL_ID = 2;//默认数据库id
33 const IS_UPGRADE_FALSE = 0; 34 const IS_UPGRADE_FALSE = 0;
34 const IS_UPGRADE_TRUE = 1; 35 const IS_UPGRADE_TRUE = 1;