gx询盘查询

@@ -264,7 +264,11 @@ class VideoTask extends Command
             }
             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();
-                $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);
             }else{
                 $products = $productsQuery;

@@ -47,14 +47,24 @@ class InquiryController extends BaseController
             $data = $logic->getApiList();
         }
         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){
             $url = 'https://fob.ai.cc/api/mobile_verify_data/'.$phone;
             $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{
             $data = json_decode($info['data']);
         }