作者 赵彬吉

update

@@ -206,7 +206,7 @@ class SyncProject extends Command @@ -206,7 +206,7 @@ class SyncProject extends Command
206 DB::commit(); 206 DB::commit();
207 }catch (\Exception $e){ 207 }catch (\Exception $e){
208 DB::rollBack(); 208 DB::rollBack();
209 - errorLog('项目同步失败', $data, $e); 209 + throw new \Exception($e->getMessage());
210 } 210 }
211 } 211 }
212 212
@@ -275,12 +275,12 @@ class SyncProject extends Command @@ -275,12 +275,12 @@ class SyncProject extends Command
275 protected function savePayment($param,$id){ 275 protected function savePayment($param,$id){
276 $param['project_id'] = $id; 276 $param['project_id'] = $id;
277 $paymentModel= new Payment(); 277 $paymentModel= new Payment();
278 - if(isset($param['contract']) && !empty($param['contract'])){ 278 +// if(isset($param['contract']) && !empty($param['contract'])){
279 $param['contract'] = Arr::a2s($param['contract']); 279 $param['contract'] = Arr::a2s($param['contract']);
280 - }  
281 - if(isset($param['bill']) && !empty($param['bill'])){ 280 +// }
  281 +// if(isset($param['bill']) && !empty($param['bill'])){
282 $param['bill'] = Arr::a2s($param['bill']); 282 $param['bill'] = Arr::a2s($param['bill']);
283 - } 283 +// }
284 $info = $paymentModel->read(['project_id'=>$id]); 284 $info = $paymentModel->read(['project_id'=>$id]);
285 if($info !== false){ 285 if($info !== false){
286 $paymentModel->edit($param,['id'=>$info['id']]); 286 $paymentModel->edit($param,['id'=>$info['id']]);
@@ -40,9 +40,9 @@ class Channel extends Model @@ -40,9 +40,9 @@ class Channel extends Model
40 } 40 }
41 $user = User::where('channel_id', $channel['id'])->where('name', $sales)->first(); 41 $user = User::where('channel_id', $channel['id'])->where('name', $sales)->first();
42 return [ 42 return [
43 - 'zone_id' => (int)$channel['zone_id'] ?? 0,  
44 - 'channel_id' => (int)$channel['id'] ?? 0,  
45 - 'user_id' => (int)$user['id'] ?? 0, 43 + 'zone_id' => $channel['zone_id'] ?? 0,
  44 + 'channel_id' => $channel['id'] ?? 0,
  45 + 'user_id' => $user['id'] ?? 0,
46 ]; 46 ];
47 } 47 }
48 48