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

@@ -191,14 +191,10 @@ class SyncProject extends Command
             'project_after' => [],
             'project_after' => [],
             'payment' => [
             'payment' => [
                 'amount' => $param['plan_price'],
                 'amount' => $param['plan_price'],
+                'contract'=>$param['files'],
+                'bill'=>$param['images']
             ],
             ],
         ];
         ];
-        if(!empty($param['files'])){
-            $data['payment']['contract'] = json_encode($param['files']);
-        }
-        if(!empty($param['images'])){
-            $data['payment']['bill'] = json_encode($param['images']);
-        }
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
             $id = $this->saveProject($data['project']);
             $id = $this->saveProject($data['project']);
@@ -274,12 +270,12 @@ 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']);
-        }
+//        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']);
+//        }
         return $paymentModel->add($param);
         return $paymentModel->add($param);
     }
     }
 
 

@@ -423,7 +423,7 @@ class ProjectController extends BaseController
      */
      */
     public function getDomain(){
     public function getDomain(){
         $domainModel = new DomainInfo();
         $domainModel = new DomainInfo();
-        $list = $domainModel->list(['status'=>0]);
+        $list = $domainModel->list(['status'=>0,'project_id'=>['or',$this->param['project_id']]]);
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
 }
 }