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

@@ -64,6 +64,9 @@ class SyncProject extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
+        $api = new OaGlobalsoApi();
+        $data = $api->order_info(15063);
+        dd($data);
         while (true){
         while (true){
             $list = NoticeLog::where('type', NoticeLog::TYPE_PROJECT)->where('status', NoticeLog::STATUS_PENDING)->get();
             $list = NoticeLog::where('type', NoticeLog::TYPE_PROJECT)->where('status', NoticeLog::STATUS_PENDING)->get();
             foreach ($list as $item){
             foreach ($list as $item){
@@ -102,7 +105,9 @@ class SyncProject extends Command
                         $this->renewSync($data['data']);
                         $this->renewSync($data['data']);
                     }
                     }
                     // TODO 如果是续费项目 并且有GEO版本，需要处理GEO版本
                     // TODO 如果是续费项目 并且有GEO版本，需要处理GEO版本
-                    if (($data['data']['order_type'] == '续费') && !empty($data['data']['geo_plan'])) {
+                    if (($data['data']['order_type'] == '续费') && FALSE == empty($data['data']['geo_plan']) && $data['data']['geo_plan'] != '无') {
+                        // 续费单，并且有GEO版本， 正常版本不创建 初始化正常版本
+                        $data['data']['plan_marketing'] = '无';
                         //创建对应的GEO版本
                         //创建对应的GEO版本
                         $projectModel = new Project();
                         $projectModel = new Project();
                         $seo_plan = $this->versionSeoData($data['data']['geo_plan'] ?? '');
                         $seo_plan = $this->versionSeoData($data['data']['geo_plan'] ?? '');