合并分支 'master-server' 到 'master'

修改脚本



查看合并请求 !777

@@ -264,7 +264,11 @@ class VideoTask extends Command
             }
             }
             if (count($productIds) < 13){
             if (count($productIds) < 13){
                 $product_all_id = Product::where('thumb','!=',null)->whereNotIn('id', $productIds)->where("status",Product::STATUS_ON)->inRandomOrder()->take(20 - count($productIds))->pluck('id')->toArray();
                 $product_all_id = Product::where('thumb','!=',null)->whereNotIn('id', $productIds)->where("status",Product::STATUS_ON)->inRandomOrder()->take(20 - count($productIds))->pluck('id')->toArray();
-                $randomData = Product::whereIn("id", $product_all_id)->orderByRaw(DB::raw("FIELD(id, " . implode(',', $product_all_id) . ")"))->get();
+                if(empty($product_all_id)){
+                    $randomData = [];
+                }else{
+                    $randomData = Product::whereIn("id", $product_all_id)->orderByRaw(DB::raw("FIELD(id, " . implode(',', $product_all_id) . ")"))->get();
+                }
                 $products = $productsQuery->merge($randomData);
                 $products = $productsQuery->merge($randomData);
             }else{
             }else{
                 $products = $productsQuery;
                 $products = $productsQuery;

@@ -56,7 +56,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[1871]]]);
+        $list = $projectModel->list(['id'=>['in',[2350]]]);
         $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;
@@ -222,18 +222,18 @@ class UpdateRoute extends Command
         if(!empty($lists)){
         if(!empty($lists)){
             foreach ($lists as $v){
             foreach ($lists as $v){
                 if(!empty($v['route'])){
                 if(!empty($v['route'])){
-                    $tag = "-product";
-                    if (!(substr($v['route'], -strlen($tag)) === $tag)) {
-                        echo date('Y-m-d H:i:s') . '拼接'.$tag . PHP_EOL;
-                        $route = $v['route'].$tag;
-                        // 如果不是以 '-product' 结尾，则拼接上 '-product'
-                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
-                        $productModel->edit(['route'=>$route],['id'=>$v['id']]);
-                    }else{
+//                    $tag = "-product";
+//                    if (!(substr($v['route'], -strlen($tag)) === $tag)) {
+//                        echo date('Y-m-d H:i:s') . '拼接'.$tag . PHP_EOL;
+//                        $route = $v['route'].$tag;
+//                        // 如果不是以 '-product' 结尾，则拼接上 '-product'
+//                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
+//                        $productModel->edit(['route'=>$route],['id'=>$v['id']]);
+//                    }else{
                         echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
                         echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
                         $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
                         $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
                         $productModel->edit(['route'=>$route],['id'=>$v['id']]);
                         $productModel->edit(['route'=>$route],['id'=>$v['id']]);
-                    }
+//                    }
                     continue;
                     continue;
                 }else{
                 }else{
                     echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
                     echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;

@@ -281,6 +281,13 @@ class ProjectController extends BaseController
         if(isset($this->map['site_status'])){
         if(isset($this->map['site_status'])){
             $query = $query->where('gl_project.site_status',$this->map['site_status']);
             $query = $query->where('gl_project.site_status',$this->map['site_status']);
         }
         }
+        if(isset($this->map['domain'])){
+            if($this->map['domain'] == 0){
+                $query = $query->where('gl_project_deploy_optimize.domain',null);
+            }else{
+                $query = $query->where('gl_project_deploy_optimize.domain',null);
+            }
+        }
         return $query;
         return $query;
     }
     }
 
 

@@ -47,14 +47,24 @@ class InquiryController extends BaseController
             $data = $logic->getApiList();
             $data = $logic->getApiList();
         }
         }
         if(!empty($data) && !empty($data['list'])){
         if(!empty($data) && !empty($data['list'])){
-            foreach ($data['list'] as $k => &$v){
-                if(isset($v['phone']) && !empty($v['phone'])){
-                    $phoneInfo = (new PhoneData())->read(['phone'=>$v['phone']]);
-                    if($phoneInfo === false){
-                        $v['phone_data'] = [];
-                    }else{
-                        $v['phone_data'] = json_decode($phoneInfo['data']);
+            $phone = [];
+            foreach ($data['list'] as $v){
+                if(!empty($v['phone'])){
+                    $phone[] = $v['phone'];
+            }
+        }
+        if(!empty($phone)){
+                $phoneDataModel = new PhoneData();
+                $phoneDataList = $phoneDataModel->list(['phone'=>['in',$phone]]);
+                foreach ($data['list'] as $key => $value){
+                    $value['phone_data'] = [];
+                    foreach ($phoneDataList as  $valuePhone){
+                        if($value['phone'] == $valuePhone['phone']){
+                            $value['phone_data'] = json_decode($valuePhone['data']);
+                            break;
+                        }
                     }
                     }
+                    $data['list'][$key] = $value;
                 }
                 }
             }
             }
         }
         }

@@ -189,11 +189,16 @@ class InquiryLogic extends BaseLogic
         if($info === false){
         if($info === false){
             $url = 'https://fob.ai.cc/api/mobile_verify_data/'.$phone;
             $url = 'https://fob.ai.cc/api/mobile_verify_data/'.$phone;
             $data = http_get($url);
             $data = http_get($url);
-            $param = [
-                'phone'=>$phone,
-                'data'=>json_encode($data,true)
-            ];
-            (new PhoneData())->addReturnId($param);
+            if(!empty($data)){
+                $param = [
+                    'phone'=>$phone,
+                    'data'=>json_encode($data,true),
+                    'wa_status'=>$data['wa_status'] ?? '',
+                    'wa_name'=>$data['wa_name'] ?? '',
+                    'wa_profile_pic'=>$data['wa_profile_pic'] ?? ''
+                ];
+                (new PhoneData())->addReturnId($param);
+            }
         }else{
         }else{
             $data = json_decode($info['data']);
             $data = json_decode($info['data']);
         }
         }