diff --git a/Laravel/app/Http/Controllers/API/H5/PersonController.php b/Laravel/app/Http/Controllers/API/H5/PersonController.php index 192ba73..93745cc 100644 --- a/Laravel/app/Http/Controllers/API/H5/PersonController.php +++ b/Laravel/app/Http/Controllers/API/H5/PersonController.php @@ -68,11 +68,13 @@ class PersonController extends Controller ]; $res = self::group_info($hospital_id, $data); $dbinfo=DB::table('web_user_person')->where(['phone'=>$phone,'id_number'=>$id_number])->first(); - $res['sex']=null; - $res['married']=null; if(!!$dbinfo){ - $res['sex']=$dbinfo->sex; - $res['married']=$dbinfo->married ; + foreach ($res as $key => $value) { + //dd($res[$key]); + $res[$key]['sex']=$dbinfo->sex; + $res[$key]['phone']=$dbinfo->phone; + $res[$key]['married']=$dbinfo->married ; + } } return \Yz::Return(true,"查询完成",['unit'=>$res]); } diff --git a/Laravel/app/Http/Controllers/API/Internal/SiXinPushController.php b/Laravel/app/Http/Controllers/API/Internal/SiXinPushController.php new file mode 100644 index 0000000..d790e5d --- /dev/null +++ b/Laravel/app/Http/Controllers/API/Internal/SiXinPushController.php @@ -0,0 +1,62 @@ +query('key'); + $code = $request->query('code');//推送类型 "UpdateInfo".套餐、项目、分组 信息变更 "report".报告推送 "pdf".推送pdf + $content = $request->input('content'); + $codeMark=[ + 'updateInfo'=>'套餐项目分组', + 'report'=>'报告', + 'pdf'=>'pdf文件' + ]; + if (!array_key_exists($code, $codeMark)) return \Yz::echoError1("code不正确"); + if(isset($key) && $key=="xFgq6WzWFNYL6QwKKLtxqYn2NfQnNu3a"){ + self::RequestLog('',$content,$code,$codeMark[$code]); + return \Yz::Return(true,"接收完成",$code); + }else{ + return \Yz::echoError1("密钥错误"); + } + } + + public static function RequestLog($url, $post_data, $code, $mark) + { + self::CheckTableName(); + + $post_data = json_encode($post_data, JSON_UNESCAPED_UNICODE); + self::$request->code = $code; + self::$request->mark = $mark; + self::$request->post_data = $post_data == '[]' ? '{}' : $post_data; + self::$request->request_url = $url; + self::$request->save(); + } + + public static function CheckTableName() + { + $table_name = 'zz_sixin_push_log_' . date('ym'); + $table_count = DB::select('select count(1) as c from information_schema.TABLES where table_schema = ? and table_name = ?', [env('DB_DATABASE'), $table_name])[0]; + if ($table_count->c === 0) { + Schema::create($table_name, function (Blueprint $table) { + $table->id(); + $table->string('code', 50)->index(); + $table->string('mark', 50)->index(); + $table->text('post_data'); + $table->text('response_data')->nullable(); + $table->string('request_url', 300); + $table->timestamps(); + }); + } + self::$request = new \App\Models\PEISLog(); + self::$request->setTable($table_name); + } +} diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index af67b78..001cb56 100644 --- a/Laravel/routes/api.php +++ b/Laravel/routes/api.php @@ -95,6 +95,10 @@ Route::post('admin/UpdateItem','App\Http\Controllers\API\Admin\YeWu\ItemControll Route::post('admin/ReportInfo','App\Http\Controllers\API\Admin\YeWu\ReportController@ReportInfo')->middleware('log'); + + + + Route::group(['middleware' => ['log'], 'prefix' => 'v1'], function () { //路由分组 Route::post('PayCheck', 'App\Http\Controllers\API\Admin\YeWu\PayController@PayCheck');//支付查询 Route::post('MakePay', 'App\Http\Controllers\API\Admin\YeWu\PayController@MakePay');//支付 diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php index 3fdf36a..d22697d 100644 --- a/Laravel/routes/web.php +++ b/Laravel/routes/web.php @@ -67,10 +67,12 @@ Route::group(['prefix' => 'api/H5'], function () { + //测试---------------------------- Route::post('/Finish_test', 'App\Http\Controllers\API\H5\OrderController@Finish_test');//测试 Route::post('/tttt', 'App\Http\Controllers\API\H5\UserController@tttt');//测试 }); - +//对外------ +Route::any('/TJPushInfo', 'App\Http\Controllers\API\Internal\SiXinPushController@PushInfo');//接收思信推送