合并分支 'develop' 到 'master'

Develop



查看合并请求 !488

@@ -158,7 +158,6 @@ class ProjectLogic extends BaseLogic
                 $this->saveProjectAfter($this->param['project_after']);
                 $this->saveProjectAfter($this->param['project_after']);
                 $this->saveMinorLanguages($this->param['minor_language'] ?? []);
                 $this->saveMinorLanguages($this->param['minor_language'] ?? []);
                 $this->syncImageFile($this->param['project_location'],$this->param['id']);
                 $this->syncImageFile($this->param['project_location'],$this->param['id']);
-                //创建站点
                 (new SyncService())->projectAcceptAddress($this->param['id']);
                 (new SyncService())->projectAcceptAddress($this->param['id']);
             }
             }
             DB::commit();
             DB::commit();

@@ -58,6 +58,7 @@ class CopyProjectJob implements ShouldQueue
             $type = $data['type'];
             $type = $data['type'];
             $data['type'] = 0;
             $data['type'] = 0;
             $data['status'] = 0;
             $data['status'] = 0;
+            $data['finish_remain_day'] = 0;
             $data['title'] = $data['title'].'-copy';
             $data['title'] = $data['title'].'-copy';
             unset($data['id']);
             unset($data['id']);
             $project_id = $projectModel->insertGetId($data);
             $project_id = $projectModel->insertGetId($data);
@@ -82,6 +83,8 @@ class CopyProjectJob implements ShouldQueue
                 $optimizeData = $optimizeData->getAttributes();
                 $optimizeData = $optimizeData->getAttributes();
                 unset($optimizeData['id'],$optimizeData['domain']);
                 unset($optimizeData['id'],$optimizeData['domain']);
                 $optimizeData['project_id'] = $project_id;
                 $optimizeData['project_id'] = $project_id;
+                $optimizeData['api_no'] = 0;
+                $optimizeData['api_no'] = json_encode([]);
                 $optimizeModel->insert($optimizeData);
                 $optimizeModel->insert($optimizeData);
             }
             }
             //复制付费表
             //复制付费表
@@ -160,6 +163,9 @@ class CopyProjectJob implements ShouldQueue
                 $sql = DB::connection('custom_tmp_mysql_copy')->select("SHOW CREATE TABLE {$table}");
                 $sql = DB::connection('custom_tmp_mysql_copy')->select("SHOW CREATE TABLE {$table}");
                 DB::connection('custom_mysql')->statement(get_object_vars($sql[0])['Create Table']);
                 DB::connection('custom_mysql')->statement(get_object_vars($sql[0])['Create Table']);
             }
             }
+            if($table == 'gl_customer_visit' ||  $table == 'gl_customer_visit_item' || $table == 'gl_inquiry_other' || $table == 'gl_inquiry_form_data' || $table == 'gl_inquiry_form'){
+                continue;
+            }
 //            DB::connection('custom_mysql')->table($table)->truncate(); // 清空目标表数据
 //            DB::connection('custom_mysql')->table($table)->truncate(); // 清空目标表数据
             DB::connection('custom_mysql')->table($table)->insertUsing(
             DB::connection('custom_mysql')->table($table)->insertUsing(
                 [], // 列名数组，留空表示插入所有列
                 [], // 列名数组，留空表示插入所有列