周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 b97d347799578a55e0bcdab0c415d624b0c5d984 1 个父辈 8a812b70

update

内嵌 并排对比
正在显示 3 个修改的文件 包含 1 行增加 和 8 行删除
@@ -38,7 +38,7 @@ class WorkchatMessageSend extends Command @@ -38,7 +38,7 @@ class WorkchatMessageSend extends Command
38 $this->output('开始推送消息' . $task->id); 38 $this->output('开始推送消息' . $task->id);
39 try { 39 try {
40 //超过两小时 不推送了 40 //超过两小时 不推送了
41 - if(time() - $task->send_time > 7200){ 41 + if(time() - strtotime($task->send_time) > 7200){
42 throw new \Exception('超时两小时未推送'); 42 throw new \Exception('超时两小时未推送');
43 } 43 }
44 ProjectAssociationServices::getInstance()->sendMessage($task->friend_id, $task->content, $task->content_type); 44 ProjectAssociationServices::getInstance()->sendMessage($task->friend_id, $task->content, $task->content_type);
@@ -42,7 +42,6 @@ class MessagePush extends Base @@ -42,7 +42,6 @@ class MessagePush extends Base
42 */ 42 */
43 public static function addInquiryMessage($id, $project_id, $country, $name, $submit_at){ 43 public static function addInquiryMessage($id, $project_id, $country, $name, $submit_at){
44 if(!ProjectServer::useProject($project_id)){ 44 if(!ProjectServer::useProject($project_id)){
45 - $project_id == 650 && LogUtils::info('询盘消息数据库切换失败');  
46 return false; 45 return false;
47 } 46 }
48 47
@@ -52,7 +51,6 @@ class MessagePush extends Base @@ -52,7 +51,6 @@ class MessagePush extends Base
52 ->where('binding_app', ProjectAssociation::ENTERPRISE_WECHAT) 51 ->where('binding_app', ProjectAssociation::ENTERPRISE_WECHAT)
53 ->value('friend_id'); 52 ->value('friend_id');
54 if(!$friend_id){ 53 if(!$friend_id){
55 - $project_id == 650 && LogUtils::info('询盘消息没有绑定群');  
56 return false; 54 return false;
57 } 55 }
58 56
@@ -67,8 +65,6 @@ class MessagePush extends Base @@ -67,8 +65,6 @@ class MessagePush extends Base
67 $model->ref_ids = $id; 65 $model->ref_ids = $id;
68 $model->content = '[' . date('H:i', strtotime($submit_at)) . '] 您的全球搜网站收到来自【' . $country . $name . '】的询盘信息，请登录后台或APP进行查看!'; 66 $model->content = '[' . date('H:i', strtotime($submit_at)) . '] 您的全球搜网站收到来自【' . $country . $name . '】的询盘信息，请登录后台或APP进行查看!';
69 $model->send_time = $submit_at; 67 $model->send_time = $submit_at;
70 -  
71 - $project_id == 650 && LogUtils::info('询盘消息：'. $model->content);  
72 }else{ 68 }else{
73 //定时发送时间 69 //定时发送时间
74 $send_time = $hour >= 9 ? date('Y-m-d 09:00:00', strtotime($submit_at . '+1 day')) : date('Y-m-d 09:00:00', strtotime($submit_at)); 70 $send_time = $hour >= 9 ? date('Y-m-d 09:00:00', strtotime($submit_at . '+1 day')) : date('Y-m-d 09:00:00', strtotime($submit_at));
@@ -95,7 +91,6 @@ class MessagePush extends Base @@ -95,7 +91,6 @@ class MessagePush extends Base
95 } 91 }
96 $model->content = '[09:00] 您的全球搜网站收到来自【' . $country . '】'.$count.'条询盘信息，请登录后台或APP进行查看!'; 92 $model->content = '[09:00] 您的全球搜网站收到来自【' . $country . '】'.$count.'条询盘信息，请登录后台或APP进行查看!';
97 } 93 }
98 - $project_id == 650 && LogUtils::info('询盘消息：'. $model->content);  
99 } 94 }
100 $model->save(); 95 $model->save();
101 } 96 }
@@ -155,7 +155,6 @@ class SyncSubmitTaskService @@ -155,7 +155,6 @@ class SyncSubmitTaskService
155 155
156 $id = InquiryFormData::saveData($form_id, $data['domain'], $data['ip'], $data['country'], $data['referer'], $data['user_agent'], $data['submit_at'], $data['data']); 156 $id = InquiryFormData::saveData($form_id, $data['domain'], $data['ip'], $data['country'], $data['referer'], $data['user_agent'], $data['submit_at'], $data['data']);
157 157
158 - $data['project_id'] == 650 && LogUtils::info('650询盘消息'. $id);  
159 158
160 //转化询盘 159 //转化询盘
161 Visit::isInquiry($data['ip']); 160 Visit::isInquiry($data['ip']);
@@ -163,7 +162,6 @@ class SyncSubmitTaskService @@ -163,7 +162,6 @@ class SyncSubmitTaskService
163 //推送企微消息 162 //推送企微消息
164 if($id){ 163 if($id){
165 try { 164 try {
166 - $data['project_id'] == 650 && LogUtils::info('650询盘消息'. $id);  
167 $name = empty($data['data']['name']) ? '' : ' ' . $data['data']['name']; 165 $name = empty($data['data']['name']) ? '' : ' ' . $data['data']['name'];
168 MessagePush::addInquiryMessage($id, $data['project_id'], $data['country'], $name, $data['submit_at']); 166 MessagePush::addInquiryMessage($id, $data['project_id'], $data['country'], $name, $data['submit_at']);
169 }catch (\Exception $e){ 167 }catch (\Exception $e){