正在显示
3 个修改的文件
包含
32 行增加
和
13 行删除
| @@ -264,7 +264,11 @@ class VideoTask extends Command | @@ -264,7 +264,11 @@ class VideoTask extends Command | ||
| 264 | } | 264 | } |
| 265 | if (count($productIds) < 13){ | 265 | if (count($productIds) < 13){ |
| 266 | $product_all_id = Product::where('thumb','!=',null)->whereNotIn('id', $productIds)->where("status",Product::STATUS_ON)->inRandomOrder()->take(20 - count($productIds))->pluck('id')->toArray(); | 266 | $product_all_id = Product::where('thumb','!=',null)->whereNotIn('id', $productIds)->where("status",Product::STATUS_ON)->inRandomOrder()->take(20 - count($productIds))->pluck('id')->toArray(); |
| 267 | - $randomData = Product::whereIn("id", $product_all_id)->orderByRaw(DB::raw("FIELD(id, " . implode(',', $product_all_id) . ")"))->get(); | 267 | + if(empty($product_all_id)){ |
| 268 | + $randomData = []; | ||
| 269 | + }else{ | ||
| 270 | + $randomData = Product::whereIn("id", $product_all_id)->orderByRaw(DB::raw("FIELD(id, " . implode(',', $product_all_id) . ")"))->get(); | ||
| 271 | + } | ||
| 268 | $products = $productsQuery->merge($randomData); | 272 | $products = $productsQuery->merge($randomData); |
| 269 | }else{ | 273 | }else{ |
| 270 | $products = $productsQuery; | 274 | $products = $productsQuery; |
| @@ -47,14 +47,24 @@ class InquiryController extends BaseController | @@ -47,14 +47,24 @@ class InquiryController extends BaseController | ||
| 47 | $data = $logic->getApiList(); | 47 | $data = $logic->getApiList(); |
| 48 | } | 48 | } |
| 49 | if(!empty($data) && !empty($data['list'])){ | 49 | if(!empty($data) && !empty($data['list'])){ |
| 50 | - foreach ($data['list'] as $k => &$v){ | ||
| 51 | - if(isset($v['phone']) && !empty($v['phone'])){ | ||
| 52 | - $phoneInfo = (new PhoneData())->read(['phone'=>$v['phone']]); | ||
| 53 | - if($phoneInfo === false){ | ||
| 54 | - $v['phone_data'] = []; | ||
| 55 | - }else{ | ||
| 56 | - $v['phone_data'] = json_decode($phoneInfo['data']); | 50 | + $phone = []; |
| 51 | + foreach ($data['list'] as $v){ | ||
| 52 | + if(!empty($v['phone'])){ | ||
| 53 | + $phone[] = $v['phone']; | ||
| 54 | + } | ||
| 55 | + } | ||
| 56 | + if(!empty($phone)){ | ||
| 57 | + $phoneDataModel = new PhoneData(); | ||
| 58 | + $phoneDataList = $phoneDataModel->list(['phone'=>['in',$phone]]); | ||
| 59 | + foreach ($data['list'] as $key => $value){ | ||
| 60 | + $value['phone_data'] = []; | ||
| 61 | + foreach ($phoneDataList as $valuePhone){ | ||
| 62 | + if($value['phone'] == $valuePhone['phone']){ | ||
| 63 | + $value['phone_data'] = json_decode($valuePhone['data']); | ||
| 64 | + break; | ||
| 65 | + } | ||
| 57 | } | 66 | } |
| 67 | + $data['list'][$key] = $value; | ||
| 58 | } | 68 | } |
| 59 | } | 69 | } |
| 60 | } | 70 | } |
| @@ -189,11 +189,16 @@ class InquiryLogic extends BaseLogic | @@ -189,11 +189,16 @@ class InquiryLogic extends BaseLogic | ||
| 189 | if($info === false){ | 189 | if($info === false){ |
| 190 | $url = 'https://fob.ai.cc/api/mobile_verify_data/'.$phone; | 190 | $url = 'https://fob.ai.cc/api/mobile_verify_data/'.$phone; |
| 191 | $data = http_get($url); | 191 | $data = http_get($url); |
| 192 | - $param = [ | ||
| 193 | - 'phone'=>$phone, | ||
| 194 | - 'data'=>json_encode($data,true) | ||
| 195 | - ]; | ||
| 196 | - (new PhoneData())->addReturnId($param); | 192 | + if(!empty($data)){ |
| 193 | + $param = [ | ||
| 194 | + 'phone'=>$phone, | ||
| 195 | + 'data'=>json_encode($data,true), | ||
| 196 | + 'wa_status'=>$data['wa_status'] ?? '', | ||
| 197 | + 'wa_name'=>$data['wa_name'] ?? '', | ||
| 198 | + 'wa_profile_pic'=>$data['wa_profile_pic'] ?? '' | ||
| 199 | + ]; | ||
| 200 | + (new PhoneData())->addReturnId($param); | ||
| 201 | + } | ||
| 197 | }else{ | 202 | }else{ |
| 198 | $data = json_decode($info['data']); | 203 | $data = json_decode($info['data']); |
| 199 | } | 204 | } |
-
请 注册 或 登录 后发表评论