updtae

@@ -79,16 +79,19 @@ class MessagePush extends Base
                 $model->friend_id = $friend_id;
                 $model->friend_id = $friend_id;
                 $model->type = self::TYPE_INQUIRY;
                 $model->type = self::TYPE_INQUIRY;
                 $model->ref_ids = $id;
                 $model->ref_ids = $id;
+                $model->countries = $country;
                 $model->send_time = $send_time;
                 $model->send_time = $send_time;
                 $model->content = '[09:00] 您的全球搜网站收到来自【' . $country . $name . '】的询盘信息，请登录后台或APP进行查看!';
                 $model->content = '[09:00] 您的全球搜网站收到来自【' . $country . $name . '】的询盘信息，请登录后台或APP进行查看!';
             }else{
             }else{
                 $ref_ids = explode(',', $model->ref_ids);
                 $ref_ids = explode(',', $model->ref_ids);
                 $ref_ids[] = $id;
                 $ref_ids[] = $id;
                 $model->ref_ids = implode(',', $ref_ids);
                 $model->ref_ids = implode(',', $ref_ids);
-                $countries = InquiryFormData::whereIn('id', $ref_ids)->pluck('country')->toArray();
+                $countries = explode(',', $model->countries);
+                $countries[] = $country;
+                $model->countries = implode(',', $countries);
 
 
                 // 升级项目部分询盘无法监控， 会通过接口通知， 但是ID会值为固定值0，在数据库查不到， 无法获取对应国家
                 // 升级项目部分询盘无法监控， 会通过接口通知， 但是ID会值为固定值0，在数据库查不到， 无法获取对应国家
-                $count = count($ref_ids);
+                $count = count($countries);
                 if ($countries) {
                 if ($countries) {
                     $countries = array_unique($countries);
                     $countries = array_unique($countries);
                     if(count($countries) > 3){
                     if(count($countries) > 3){
@@ -98,16 +101,6 @@ class MessagePush extends Base
                     }
                     }
                 }
                 }
                 $model->content = '[09:00] 您的全球搜网站收到来自【' . $country . '】'.$count.'条询盘信息，请登录后台或APP进行查看!';
                 $model->content = '[09:00] 您的全球搜网站收到来自【' . $country . '】'.$count.'条询盘信息，请登录后台或APP进行查看!';
-
-                // 之前代码
-//                $count = count($countries);
-//                $countries = array_unique($countries);
-//                if(count($countries) > 3){
-//                    $country = implode(',', array_slice($countries, 0, 3)) . '...';
-//                }else{
-//                    $country = implode(',', $countries);
-//                }
-//                $model->content = '[09:00] 您的全球搜网站收到来自【' . $country . '】'.$count.'条询盘信息，请登录后台或APP进行查看!';
             }
             }
         }
         }
         $model->save();
         $model->save();