Commit c140375e c140375eda4ec4d342684a43f5d15522580398a0 by lemon

修改同步脚本

1 parent aeef5467
...@@ -74,10 +74,10 @@ class StakeholderIncomeSyncCommand extends Command ...@@ -74,10 +74,10 @@ class StakeholderIncomeSyncCommand extends Command
74 74
75 $id = key($msg[$key]); 75 $id = key($msg[$key]);
76 $serial_no = $msg[$key][$id]['serial_no']; 76 $serial_no = $msg[$key][$id]['serial_no'];
77 $http_res = [];
77 78
78 Log::channel('api')->warning(__METHOD__."streamid:{$id}-即将处理任务", ['item'=>$msg[$key][$id]]); 79 Log::channel('api')->warning(__METHOD__."streamid:{$id}-即将处理任务", ['item'=>$msg[$key][$id]]);
79 80
80
81 //获取记录 81 //获取记录
82 if ($http_data = $this->resolveSyncData($serial_no)) { 82 if ($http_data = $this->resolveSyncData($serial_no)) {
83 83
...@@ -93,7 +93,7 @@ class StakeholderIncomeSyncCommand extends Command ...@@ -93,7 +93,7 @@ class StakeholderIncomeSyncCommand extends Command
93 Log::channel('api')->info(__METHOD__, ['msg'=>'找不到需要同步的对应的收益记录', 'serial_no'=>$serial_no]); 93 Log::channel('api')->info(__METHOD__, ['msg'=>'找不到需要同步的对应的收益记录', 'serial_no'=>$serial_no]);
94 } 94 }
95 95
96 $this->consumeTask($redis, $key, $id); 96 $this->consumeTask($http_res, $redis, $key, $id);
97 } 97 }
98 } 98 }
99 } 99 }
...@@ -115,10 +115,10 @@ class StakeholderIncomeSyncCommand extends Command ...@@ -115,10 +115,10 @@ class StakeholderIncomeSyncCommand extends Command
115 'response_log' => $response 115 'response_log' => $response
116 ]); 116 ]);
117 117
118 if (!empty($response) && ($response['code'] == 0)) { 118 if (!empty($response)) {
119 StakeholderIncomeSyncApp::query()->where(['serial_no'=>$serial_no])->update([ 119 StakeholderIncomeSyncApp::query()->where(['serial_no'=>$serial_no])->update([
120 'busi_id' => $response['id'], 120 'busi_id' => $response['id'],
121 'sync_status' => 1, 121 'sync_status' => ($response['code'] == 0 ) ? 1 : 2,
122 ]); 122 ]);
123 } 123 }
124 124
...@@ -133,14 +133,17 @@ class StakeholderIncomeSyncCommand extends Command ...@@ -133,14 +133,17 @@ class StakeholderIncomeSyncCommand extends Command
133 } 133 }
134 134
135 /** 135 /**
136 * 消费任务 136 * 将任务id标记为删除
137 * @param $http_res
137 * @param $redis 138 * @param $redis
138 * @param $key 139 * @param $key
139 * @param $id 140 * @param $id
140 * @return mixed 141 * @return mixed
141 */ 142 */
142 private function consumeTask($redis, $key, $id) 143 private function consumeTask($http_res, $redis, $key, $id)
143 { 144 {
145
146
144 return $redis->xdel($key, [$id]); 147 return $redis->xdel($key, [$id]);
145 } 148 }
146 149
......
...@@ -33,12 +33,12 @@ class Http ...@@ -33,12 +33,12 @@ class Http
33 33
34 $data = json_decode($response->getBody()->getContents(), true); 34 $data = json_decode($response->getBody()->getContents(), true);
35 35
36 Log::info(__METHOD__, ['url'=>$url, 'params'=>$params, 'data'=>$data]); 36 Log::channel('api')->info(__METHOD__, ['url'=>$url, 'params'=>$params, 'data'=>$data]);
37 37
38 return $data; 38 return $data;
39 39
40 } catch (\Exception $e) { 40 } catch (\Exception $e) {
41 Log::info(__METHOD__, ['msg'=>$e->getMessage()]); 41 Log::channel('api')->info(__METHOD__, ['msg'=>$e->getMessage()]);
42 return []; 42 return [];
43 } 43 }
44 } 44 }
...@@ -57,12 +57,12 @@ class Http ...@@ -57,12 +57,12 @@ class Http
57 57
58 $data = json_decode($response->getBody()->getContents(), true); 58 $data = json_decode($response->getBody()->getContents(), true);
59 59
60 Log::info(__METHOD__, ['url'=>$url, 'data'=>$data]); 60 Log::channel('api')->info(__METHOD__, ['url'=>$url, 'data'=>$data]);
61 61
62 return $data; 62 return $data;
63 63
64 } catch (\Exception $e) { 64 } catch (\Exception $e) {
65 Log::info(__METHOD__, ['msg'=>$e->getMessage()]); 65 Log::channel('api')->info(__METHOD__, ['msg'=>$e->getMessage()]);
66 return []; 66 return [];
67 } 67 }
68 } 68 }
......