gx

@@ -225,19 +225,15 @@ class SyncProject extends Command
 
 
             if($is_update == 1){
             if($is_update == 1){
                 //4.0或5.0更新到6.0
                 //4.0或5.0更新到6.0
-
                 //初始化数据库
                 //初始化数据库
                 $this->initializationMysql($id);
                 $this->initializationMysql($id);
-
                 //初始账号
                 //初始账号
                 $this->createUser($data['project']['mobile'],$id,$data['project']['lead_name']);
                 $this->createUser($data['project']['mobile'],$id,$data['project']['lead_name']);
-
                 //新增数据抓取任务
                 //新增数据抓取任务
                 foreach ($param['api_type'] as $v_type){
                 foreach ($param['api_type'] as $v_type){
                     UpdateLog::createLog($id,$v_type,$param['get_data_url']);
                     UpdateLog::createLog($id,$v_type,$param['get_data_url']);
                 }
                 }
             }
             }
-
             DB::commit();
             DB::commit();
         }catch (\Exception $e){
         }catch (\Exception $e){
             DB::rollBack();
             DB::rollBack();
@@ -272,6 +268,8 @@ class SyncProject extends Command
     public function saveProject($param){
     public function saveProject($param){
         if(isset($param['channel']) && !empty($param['channel'])){
         if(isset($param['channel']) && !empty($param['channel'])){
             $param['channel'] = Arr::a2s($param['channel']);
             $param['channel'] = Arr::a2s($param['channel']);
+        }else{
+            $param['channel'] = Arr::a2s(["user_id"=>"", "zone_id"=>"", "channel_id"=>""]);
         }
         }
         $projectModel = new Project();
         $projectModel = new Project();
         $info = $projectModel->read(['from_order_id'=>$param['from_order_id'],'delete_status'=>0]);
         $info = $projectModel->read(['from_order_id'=>$param['from_order_id'],'delete_status'=>0]);
@@ -311,12 +309,8 @@ class SyncProject extends Command
     protected function savePayment($param,$id){
     protected function savePayment($param,$id){
         $param['project_id'] = $id;
         $param['project_id'] = $id;
         $paymentModel= new Payment();
         $paymentModel= new Payment();
-//        if(isset($param['contract']) && !empty($param['contract'])){
-            $param['contract'] = Arr::a2s($param['contract']);
-//        }
-//        if(isset($param['bill']) && !empty($param['bill'])){
-            $param['bill'] = Arr::a2s($param['bill']);
-//        }
+        $param['contract'] = Arr::a2s($param['contract']);
+        $param['bill'] = Arr::a2s($param['bill']);
         $info = $paymentModel->read(['project_id'=>$id]);
         $info = $paymentModel->read(['project_id'=>$id]);
         if($info !== false){
         if($info !== false){
             $paymentModel->edit($param,['id'=>$info['id']]);
             $paymentModel->edit($param,['id'=>$info['id']]);

@@ -68,9 +68,12 @@ class ProjectLogic extends BaseLogic
             $info['type'] = $info['extend_type'];
             $info['type'] = $info['extend_type'];
         }
         }
         //升级项目初始上传配置
         //升级项目初始上传配置
-        if(!empty($info['upload_config'])){
+        if(empty($info['upload_config'])){
             $info['upload_config'] =["upload_max_num"=>100, "allow_file_type"=>"doc,docx,xls,xlsx,pdf,txt,csv,png,jpg,jpeg", "upload_max_size"=>5];
             $info['upload_config'] =["upload_max_num"=>100, "allow_file_type"=>"doc,docx,xls,xlsx,pdf,txt,csv,png,jpg,jpeg", "upload_max_size"=>5];
         }
         }
+        if(empty($info['channel'])){
+            $info['upload_config'] = ["user_id"=>"", "zone_id"=>"", "channel_id"=>""];
+        }
         return $this->success($info);
         return $this->success($info);
     }
     }