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

@@ -206,7 +206,7 @@ class SyncProject extends Command
             DB::commit();
         }catch (\Exception $e){
             DB::rollBack();
-            errorLog('项目同步失败', $data, $e);
+            throw new \Exception($e->getMessage());
         }
     }
 
@@ -275,12 +275,12 @@ class SyncProject extends Command
     protected function savePayment($param,$id){
         $param['project_id'] = $id;
         $paymentModel= new Payment();
-        if(isset($param['contract']) && !empty($param['contract'])){
+//        if(isset($param['contract']) && !empty($param['contract'])){
             $param['contract'] = Arr::a2s($param['contract']);
-        }
-        if(isset($param['bill']) && !empty($param['bill'])){
+//        }
+//        if(isset($param['bill']) && !empty($param['bill'])){
             $param['bill'] = Arr::a2s($param['bill']);
-        }
+//        }
         $info = $paymentModel->read(['project_id'=>$id]);
         if($info !== false){
             $paymentModel->edit($param,['id'=>$info['id']]);

@@ -40,9 +40,9 @@ class Channel extends Model
         }
         $user = User::where('channel_id', $channel['id'])->where('name', $sales)->first();
         return [
-            'zone_id' => (int)$channel['zone_id'] ?? 0,
-            'channel_id' => (int)$channel['id'] ?? 0,
-            'user_id' => (int)$user['id'] ?? 0,
+            'zone_id' => $channel['zone_id'] ?? 0,
+            'channel_id' => $channel['id'] ?? 0,
+            'user_id' => $user['id'] ?? 0,
         ];
     }