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

@@ -174,6 +174,16 @@ class SyncProject extends Command
         if(isset($data[$param])){
         if(isset($data[$param])){
             return $data[$param];
             return $data[$param];
         }else{
         }else{
+            return 0;
+        }
+    }
+
+    public function versionSeoData($param){
+        $data = Project::seoMap();
+        $data = array_flip($data);
+        if(isset($data[$param])){
+            return $data[$param];
+        }else{
             return 1;
             return 1;
         }
         }
     }
     }
@@ -210,7 +220,6 @@ class SyncProject extends Command
             ],
             ],
             'deploy_build' => [
             'deploy_build' => [
                 'service_duration' => $param['years'] ?? 0,
                 'service_duration' => $param['years'] ?? 0,
-                'plan' => $this->versionData($param['plan_marketing']),
                 'login_mobile'=>$param['principal_mobile']
                 'login_mobile'=>$param['principal_mobile']
             ],
             ],
             'deploy_optimize' => [
             'deploy_optimize' => [
@@ -223,6 +232,11 @@ class SyncProject extends Command
                 'bill'=>$param['images']
                 'bill'=>$param['images']
             ],
             ],
         ];
         ];
+        if($param['plan_marketing'] == '白帽SEO方案'){
+            $data['deploy_build']['seo_plan'] = $this->versionSeoData($param['plan_marketing']);
+        }else{
+            $data['deploy_build']['plan'] = $this->versionData($param['plan_marketing']);
+        }
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
             if(isset($data['deploy_build']['plan']) && ($data['deploy_build']['plan'] == 15)){
             if(isset($data['deploy_build']['plan']) && ($data['deploy_build']['plan'] == 15)){

@@ -459,7 +459,7 @@ class ProjectLogic extends BaseLogic
      */
      */
     protected function saveSeoPlan($project_id,$type,$plan,$seo_plan,$optimist_mid,$quality_mid){
     protected function saveSeoPlan($project_id,$type,$plan,$seo_plan,$optimist_mid,$quality_mid){
         $onlineCheckModel = new OnlineCheck();
         $onlineCheckModel = new OnlineCheck();
-        if(($plan == Project::TYPE_ZERO) && ($seo_plan == Project::TYPE_ONE) && ($type == Project::TYPE_TWO)){
+        if(($plan == Project::TYPE_ZERO) && ($seo_plan == Project::TYPE_ONE) && ($type == Project::TYPE_TWO || $type == Project::TYPE_THREE)){
             $onlineInfo = $onlineCheckModel->read(['project_id'=>$project_id]);
             $onlineInfo = $onlineCheckModel->read(['project_id'=>$project_id]);
             if($onlineInfo === false){
             if($onlineInfo === false){
                 if(empty($optimist_mid) || empty($quality_mid)){
                 if(empty($optimist_mid) || empty($quality_mid)){