Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -52,6 +52,9 @@ class Count extends Command
                 $domainInfo = new DomainInfo();
                 $domainInfo = new DomainInfo();
                 foreach ($list as $v){
                 foreach ($list as $v){
                     $v = (array)$v;
                     $v = (array)$v;
+                    if($v['type'] == Project::TYPE_ZERO){
+                        continue;
+                    }
                     if(!empty($v['domain'])){
                     if(!empty($v['domain'])){
                         $info = $domainInfo->read(['id'=>$v['domain']]);
                         $info = $domainInfo->read(['id'=>$v['domain']]);
                         if($info !== false){
                         if($info !== false){
@@ -168,6 +171,7 @@ class Count extends Command
     public function selectParam(){
     public function selectParam(){
         $select = [
         $select = [
             'gl_project.id AS id',
             'gl_project.id AS id',
+            'gl_project.type AS type',
             'gl_project.extend_type AS extend_type',
             'gl_project.extend_type AS extend_type',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.domain AS domain',

@@ -4,6 +4,7 @@ namespace App\Console\Commands\MonthlyCount;
 
 
 use App\Helper\FormGlobalsoApi;
 use App\Helper\FormGlobalsoApi;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
+use App\Models\Project\Project;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Carbon\Carbon;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
@@ -46,6 +47,9 @@ class InquiryMonthlyCount extends Command
         $domainInfo = new DomainInfo();
         $domainInfo = new DomainInfo();
         foreach ($list as  $value){
         foreach ($list as  $value){
             $value = (array)$value;
             $value = (array)$value;
+            if($value['type'] == Project::TYPE_ZERO){
+                continue;
+            }
             if(!empty($value['domain'])){
             if(!empty($value['domain'])){
                 $info = $domainInfo->read(['id'=>$value['domain']]);
                 $info = $domainInfo->read(['id'=>$value['domain']]);
                 if($info !== false){
                 if($info !== false){
@@ -177,6 +181,7 @@ class InquiryMonthlyCount extends Command
     public function selectParam(){
     public function selectParam(){
         $select = [
         $select = [
             'gl_project.id AS id',
             'gl_project.id AS id',
+            'gl_project.type AS type',
             'gl_project.extend_type AS extend_type',
             'gl_project.extend_type AS extend_type',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_optimize.domain AS domain',

@@ -241,7 +241,7 @@ class SyncProject extends Command
         $projectModel = new Project();
         $projectModel = new Project();
         $info = $projectModel->read(['from_order_id'=>$param['from_order_id']]);
         $info = $projectModel->read(['from_order_id'=>$param['from_order_id']]);
         if($info !== false){
         if($info !== false){
-            $projectModel->edit($param, ['from_order_id' => $param['from_order_id']]);
+            $projectModel->edit($param, ['id' => $info['id']]);
             return $info['id'];
             return $info['id'];
         }else{
         }else{
             return $projectModel->addReturnId($param);
             return $projectModel->addReturnId($param);