Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6
正在显示
3 个修改的文件
包含
52 行增加
和
0 行删除
| @@ -184,6 +184,13 @@ class ExtensionModuleController extends BaseController | @@ -184,6 +184,13 @@ class ExtensionModuleController extends BaseController | ||
| 184 | foreach ($data as $k => $v){ | 184 | foreach ($data as $k => $v){ |
| 185 | $info = $moduleValueModel->read(['uuid'=>$this->param['uuid'],'field_id'=>$v['field_id'],'module_id'=>$this->param['module_id']]); | 185 | $info = $moduleValueModel->read(['uuid'=>$this->param['uuid'],'field_id'=>$v['field_id'],'module_id'=>$this->param['module_id']]); |
| 186 | if($info === false){ | 186 | if($info === false){ |
| 187 | + if($this->user['project_id'] == 2205 && $this->param['module_id'] == 1){ | ||
| 188 | + if($v['field_id'] == 12 && !empty($v['value'])){//下拉框数据 | ||
| 189 | + if($v['value'] != 'Ordered'){ | ||
| 190 | + $this->fail('请重第一个流程开始选择'); | ||
| 191 | + } | ||
| 192 | + } | ||
| 193 | + } | ||
| 187 | $data = [ | 194 | $data = [ |
| 188 | 'uuid'=>$this->param['uuid'], | 195 | 'uuid'=>$this->param['uuid'], |
| 189 | 'module_id'=>$this->param['module_id'], | 196 | 'module_id'=>$this->param['module_id'], |
| @@ -239,6 +246,13 @@ class ExtensionModuleController extends BaseController | @@ -239,6 +246,13 @@ class ExtensionModuleController extends BaseController | ||
| 239 | $data = $this->param['data']; | 246 | $data = $this->param['data']; |
| 240 | $moduleValueModel = new ExtensionModuleValue(); | 247 | $moduleValueModel = new ExtensionModuleValue(); |
| 241 | foreach ($data as $k => $v){ | 248 | foreach ($data as $k => $v){ |
| 249 | + if($this->user['project_id'] == 2205 && $this->param['module_id'] == 1){ | ||
| 250 | + if($v['field_id'] == 12 && !empty($v['value'])){//下拉框数据 | ||
| 251 | + if($v['value'] != 'Ordered'){ | ||
| 252 | + $this->fail('请重第一个流程开始选择'); | ||
| 253 | + } | ||
| 254 | + } | ||
| 255 | + } | ||
| 242 | $data = [ | 256 | $data = [ |
| 243 | 'uuid'=>$uuid, | 257 | 'uuid'=>$uuid, |
| 244 | 'module_id'=>$this->param['module_id'], | 258 | 'module_id'=>$this->param['module_id'], |
| @@ -7,6 +7,7 @@ use App\Enums\Common\Code; | @@ -7,6 +7,7 @@ use App\Enums\Common\Code; | ||
| 7 | use App\Http\Controllers\Bside\BaseController; | 7 | use App\Http\Controllers\Bside\BaseController; |
| 8 | use App\Http\Logic\Bside\Inquiry\InquiryLogic; | 8 | use App\Http\Logic\Bside\Inquiry\InquiryLogic; |
| 9 | use App\Models\Inquiry\InquiryForm; | 9 | use App\Models\Inquiry\InquiryForm; |
| 10 | +use App\Models\Inquiry\PhoneData; | ||
| 10 | use App\Rules\Ids; | 11 | use App\Rules\Ids; |
| 11 | use App\Services\BatchExportService; | 12 | use App\Services\BatchExportService; |
| 12 | use Illuminate\Http\Request; | 13 | use Illuminate\Http\Request; |
| @@ -45,6 +46,25 @@ class InquiryController extends BaseController | @@ -45,6 +46,25 @@ class InquiryController extends BaseController | ||
| 45 | }else{ | 46 | }else{ |
| 46 | $data = $logic->getApiList(); | 47 | $data = $logic->getApiList(); |
| 47 | } | 48 | } |
| 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 | + $url = 'https://fob.ai.cc/api/mobile_verify_data/'.$v['phone']; | ||
| 55 | + $data = http_get($url); | ||
| 56 | + $param = [ | ||
| 57 | + 'phone'=>$v['phone'], | ||
| 58 | + 'data'=>json_encode($data,true) | ||
| 59 | + ]; | ||
| 60 | + (new PhoneData())->addReturnId($param); | ||
| 61 | + $v['phone_data'] = $data; | ||
| 62 | + }else{ | ||
| 63 | + $v['phone_data'] = json_decode($phoneInfo['data']); | ||
| 64 | + } | ||
| 65 | + } | ||
| 66 | + } | ||
| 67 | + } | ||
| 48 | $this->response('success',Code::SUCCESS,$data); | 68 | $this->response('success',Code::SUCCESS,$data); |
| 49 | } | 69 | } |
| 50 | 70 |
app/Models/Inquiry/PhoneData.php
0 → 100644
| 1 | +<?php | ||
| 2 | +/** | ||
| 3 | + * @remark : | ||
| 4 | + * @name :PhoneData.php | ||
| 5 | + * @author :lyh | ||
| 6 | + * @method :post | ||
| 7 | + * @time :2024/9/5 15:08 | ||
| 8 | + */ | ||
| 9 | + | ||
| 10 | +namespace App\Models\Inquiry; | ||
| 11 | + | ||
| 12 | +use App\Models\Base; | ||
| 13 | + | ||
| 14 | +class PhoneData extends Base | ||
| 15 | +{ | ||
| 16 | + protected $connection = "custom_mysql"; | ||
| 17 | + protected $table = 'gl_phone_data'; | ||
| 18 | +} |
-
请 注册 或 登录 后发表评论