Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -14,11 +14,8 @@ use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Mail;
 
 
 /**
 /**
- *
  * Class WorkchatMessageSend
  * Class WorkchatMessageSend
- * @package App\Console\Commands
- * @author zbj
- * @date 2023/11/28
+ * @package App\Console\Commands\Task
  */
  */
 class WorkchatMessageSend extends Command
 class WorkchatMessageSend extends Command
 {
 {

@@ -56,20 +56,38 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[1646]]]);
+        $list = $projectModel->list(['id'=>['in',[1799]]]);
         $data = [];
         $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
-            $this->getProduct();
+//            $this->getProduct();
 //            $this->setProductKeyword();
 //            $this->setProductKeyword();
 //            $this->getBlog();
 //            $this->getBlog();
 //            $this->setCustomRoute($v['id']);
 //            $this->setCustomRoute($v['id']);
+            $this->editProductAlt();
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
     }
 
 
+    public function editProductAlt(){
+        $productModel = new Product();
+        $lists = $productModel->list(['status'=>1],'id',['id','route','thumb','gallery']);
+        foreach ($lists as $k => $v){
+            $v['thumb']['alt'] = $v['route'];
+            if(!empty($v['gallery'])){
+                foreach ($v['gallery'] as $keys => $values){
+                    $values = (array)$values;
+                    $values['alt'] = $v['route'];
+                    $v['gallery'][$keys] = $values;
+                }
+            }
+            $productModel->edit(['thumb'=>$v['thumb'],'gallery'=>$v['gallery']],['id'=>$v['id']]);
+        }
+        return true;
+    }
+
     public function setCustomRoute($project_id){
     public function setCustomRoute($project_id){
         $customModel = new CustomModuleContent();
         $customModel = new CustomModuleContent();
         $list = $customModel->list();
         $list = $customModel->list();

@@ -33,7 +33,15 @@ class MessagePush extends Base
     protected $table = 'gl_workchat_message_push';
     protected $table = 'gl_workchat_message_push';
 
 
 
 
-    public static function addInquiryMessage($id, $project_id, $country, $submit_at){
+    /**
+     * @param $id
+     * @param $project_id
+     * @param $country
+     * @param $name
+     * @param $submit_at
+     * @return bool
+     */
+    public static function addInquiryMessage($id, $project_id, $country, $name, $submit_at){
         if(!ProjectServer::useProject($project_id)){
         if(!ProjectServer::useProject($project_id)){
             return false;
             return false;
         }
         }
@@ -56,7 +64,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 . '】的询盘信息，请登录后台或APP进行查看!';
+            $model->content = '[' . date('H:i', strtotime($submit_at)) . '] 您的全球搜网站收到来自【' . $country . $name . '】的询盘信息，请登录后台或APP进行查看!';
         }else{
         }else{
             //定时发送时间
             //定时发送时间
             $send_time = $hour >= 9 ? date('Y-m-d 09:00:00', strtotime('+1 day')) : date('Y-m-d 09:00:00');
             $send_time = $hour >= 9 ? date('Y-m-d 09:00:00', strtotime('+1 day')) : date('Y-m-d 09:00:00');
@@ -69,7 +77,7 @@ class MessagePush extends Base
                 $model->type = self::TYPE_INQUIRY;
                 $model->type = self::TYPE_INQUIRY;
                 $model->ref_ids = $id;
                 $model->ref_ids = $id;
                 $model->send_time = $send_time;
                 $model->send_time = $send_time;
-                $model->content = '[09:00] 您的全球搜网站收到来自【' . $country . '】的询盘信息，请登录后台或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;

@@ -160,7 +160,8 @@ class SyncSubmitTaskService
 
 
         //推送企微消息
         //推送企微消息
         try {
         try {
-            MessagePush::addInquiryMessage($id, $data['project_id'], $data['country'], $data['submit_at']);
+            $name = empty($data['data']['name']) ? '' : ' ' . $data['data']['name'];
+            MessagePush::addInquiryMessage($id, $data['project_id'], $data['country'], $name, $data['submit_at']);
         }catch (\Exception $e){
         }catch (\Exception $e){
             LogUtils::error('询盘消息'.$id.'写入企微消息队列失败' . $e->getMessage());
             LogUtils::error('询盘消息'.$id.'写入企微消息队列失败' . $e->getMessage());
         }
         }