合并分支 'zhl' 到 'master'

推送文案



查看合并请求 !3340

@@ -3,6 +3,7 @@
 namespace App\Models\Workchat;
 namespace App\Models\Workchat;
 
 
 use App\Models\Base;
 use App\Models\Base;
+use App\Models\Domain\DomainInfo;
 use App\Models\Inquiry\InquiryFormData;
 use App\Models\Inquiry\InquiryFormData;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Models\ProjectAssociation\ProjectAssociation;
@@ -64,6 +65,9 @@ class MessagePush extends Base
             return false;
             return false;
         }
         }
 
 
+        $domain = DomainInfo::where(['project_id' => $project_id, 'status' => DomainInfo::STATUS_ONE])->value('domain');
+        $domain_message = $domain ?: '';
+
         //特殊处理， 要求任何时候收到询盘都要及时推送到群里面
         //特殊处理， 要求任何时候收到询盘都要及时推送到群里面
         $special_project_ids = [650, 2045, 916, 3587, 568];
         $special_project_ids = [650, 2045, 916, 3587, 568];
         //9-21 点，每条消息及时通知
         //9-21 点，每条消息及时通知
@@ -75,7 +79,7 @@ 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->content = '[' . date('H:i', strtotime($submit_at)) . '] 您的全球搜网站收到来自【' . $country . $name . '】的询盘信息，请登录后台或APP进行查看!';
+            $model->content = '[' . date('H:i', strtotime($submit_at)) . '] 您的全球搜网站' . $domain_message . '收到来自【' . $country . $name . '】的询盘信息，请登录后台或APP进行查看!';
             $model->send_time = $submit_at;
             $model->send_time = $submit_at;
         }else{
         }else{
             //定时发送时间
             //定时发送时间
@@ -89,7 +93,7 @@ class MessagePush extends Base
                 $model->ref_ids = $id;
                 $model->ref_ids = $id;
                 $model->countries = $country;
                 $model->countries = $country;
                 $model->send_time = $send_time;
                 $model->send_time = $send_time;
-                $model->content = '[08:00] 您的全球搜网站收到来自【' . $country . $name . '】的询盘信息，请登录后台或APP进行查看!';
+                $model->content = '[08:00] 您的全球搜网站' . $domain_message . '收到来自【' . $country . $name . '】的询盘信息，请登录后台或APP进行查看!';
             }else{
             }else{
                 $ref_ids = explode(',', $model->ref_ids);
                 $ref_ids = explode(',', $model->ref_ids);
                 $ref_ids[] = $id;
                 $ref_ids[] = $id;
@@ -108,7 +112,7 @@ class MessagePush extends Base
                         $country = implode(',', $countries);
                         $country = implode(',', $countries);
                     }
                     }
                 }
                 }
-                $model->content = '[08:00] 您的全球搜网站收到来自【' . $country . '】'.$count.'条询盘信息，请登录后台或APP进行查看!';
+                $model->content = '[08:00] 您的全球搜网站' . $domain_message . '收到来自【' . $country . '】'.$count.'条询盘信息，请登录后台或APP进行查看!';
             }
             }
         }
         }
         $model->save();
         $model->save();