diff --git a/app/Controller/BasicDataController.php b/app/Controller/BasicDataController.php index 10f0bc4..7282917 100644 --- a/app/Controller/BasicDataController.php +++ b/app/Controller/BasicDataController.php @@ -168,4 +168,15 @@ class BasicDataController extends AbstractController $data = $BasicDataService->getJob(); return $this->response->json($data); } + + /** + * 获取协议内容 + * @return ResponseInterface + */ + public function getAgreementInfo(): ResponseInterface + { + $BasicDataService = new BasicDataService(); + $data = $BasicDataService->getAgreementInfo(); + return $this->response->json($data); + } } \ No newline at end of file diff --git a/app/Controller/TestController.php b/app/Controller/TestController.php index f5263a3..a223a43 100644 --- a/app/Controller/TestController.php +++ b/app/Controller/TestController.php @@ -58,11 +58,11 @@ class TestController extends AbstractController // $this->test_10(); // $this->test_11(); // $this->test_5(); -// $this->test_1(); + $this->test_1(); // $this->test_11(); // $this->test_12(); // $this->test_13(); - $this->test_14(); +// $this->test_14(); } // 获取云证书-首次 @@ -85,22 +85,22 @@ class TestController extends AbstractController // return fail(); // } -// // 测试药师 -// $data = array(); -// $data['user_id'] = "534534546"; -// $data['card_num'] = "410323199603261240"; -// $result = $ca->getCloudCert($data); -// -// $data = array(); -// $data['user_id'] = "534534546"; -// $data['cert_base64'] = $result['certBase64']; -// $data['cert_chain_p7'] = $result['certP7']; -// $data['cert_serial_number'] = $result['certSerialnumber']; -// $data['ca_pin'] = "534534546"; -// $doctor_pharmacist_cert = UserCaCert::addDoctorPharmacistCert($data); -// if (empty($doctor_pharmacist_cert)){ -// return fail(); -// } + // 测试药师 + $data = array(); + $data['user_id'] = "534534546"; + $data['card_num'] = "410323199603261240"; + $result = $ca->getCloudCert($data); + + $data = array(); + $data['user_id'] = "534534546"; + $data['cert_base64'] = $result['certBase64']; + $data['cert_chain_p7'] = $result['certP7']; + $data['cert_serial_number'] = $result['certSerialnumber']; + $data['ca_pin'] = "534534546"; + $doctor_pharmacist_cert = UserCaCert::addDoctorPharmacistCert($data); + if (empty($doctor_pharmacist_cert)){ + return fail(); + } // 测试企业 // $data = array(); diff --git a/app/Model/OperationManual.php b/app/Model/OperationManual.php index 215592e..adc4018 100644 --- a/app/Model/OperationManual.php +++ b/app/Model/OperationManual.php @@ -33,11 +33,6 @@ class OperationManual extends Model */ protected array $fillable = ['manual_id', 'app_type', 'client_type', 'status', 'sort', 'title', 'content', 'created_at', 'updated_at']; - /** - * The attributes that should be cast to native types. - */ - protected array $casts = ['manual_id' => 'string', 'app_type' => 'integer', 'client_type' => 'integer', 'created_at' => 'datetime', 'updated_at' => 'datetime']; - protected string $primaryKey = "manual_id"; /** diff --git a/app/Services/BasicDataService.php b/app/Services/BasicDataService.php index a640f21..2adbc94 100644 --- a/app/Services/BasicDataService.php +++ b/app/Services/BasicDataService.php @@ -2,6 +2,7 @@ namespace App\Services; +use App\Model\BasicAgreement; use App\Model\BasicBank; use App\Model\BasicJob; use App\Model\BasicNation; @@ -113,7 +114,7 @@ class BasicDataService extends BaseService $params = array(); $params['status'] = 1; - $operation_manual = OperationManual::getList($params); + $operation_manual = OperationManual::getList($params,$fields); if (empty($operation_manual)) { return success(); } @@ -326,4 +327,23 @@ class BasicDataService extends BaseService } return success($basic_job->toArray()); } + + /** + * 获取协议内容 + * @return array + */ + public function getAgreementInfo(): array + { + $agreement_id = $this->request->route('agreement_id'); + + $params = array(); + $params['agreement_id'] = $agreement_id; + $params['agreement_status'] = 1; + $basic_agreement = BasicAgreement::getOne($params); + if (empty($basic_agreement)){ + return success(NULL); + } + + return success($basic_agreement->toArray()); + } } \ No newline at end of file diff --git a/app/Utils/Auth.php b/app/Utils/Auth.php index 4e0a8c9..8c10dfa 100644 --- a/app/Utils/Auth.php +++ b/app/Utils/Auth.php @@ -23,6 +23,7 @@ class Auth "/area/province" => "get",// 获取省份信息 "/area/city" => "get", // 获取城市信息 "/area/county" => "get", // 获取区县信息 + "/basic/agreement/" => "get", // 获取协议内容 "/callback/wxpay/inquiry/success" => "post", // 微信问诊支付回调 "/callback/wxpay/inquiry/refund" => "post", // 微信问诊退款回调 "/callback/wxpay/product/success" => "post", // 微信药品支付回调 @@ -55,7 +56,11 @@ class Auth } }*/ + if(!empty($this->whiteApi)){ + // 去除id在路由中的情况 + $path_info = preg_replace("/(\d+)/",'',$path_info); + if (array_key_exists($path_info, $this->whiteApi)) { if ($this->whiteApi[$path_info] == '*') { return true; diff --git a/config/routes.php b/config/routes.php index 5e2b9eb..eea1a5a 100644 --- a/config/routes.php +++ b/config/routes.php @@ -501,6 +501,9 @@ Router::addGroup('/basic', function () { // 获取操作手册详情 Router::get('/operation/manual/{manual_id:\d+}', [BasicDataController::class, 'getOperationManualInfo']); + // 获取协议内容 + Router::get('/agreement/{agreement_id:\d+}', [BasicDataController::class, 'getAgreementInfo']); + // 自定义疾病分类 Router::addGroup('/disease', function () { // 搜索疾病分类 @@ -597,7 +600,7 @@ Router::get('/case', [InquiryController::class, 'getPatientInquiryCase']); // 测试使用 Router::addGroup('/test', function () { - Router::get('', [TestController::class, 'test_14']); + Router::get('', [TestController::class, 'test_13']); // 模拟退款 Router::get('/test_13', [TestController::class, 'test_13']); @@ -643,32 +646,5 @@ Router::addGroup('/inquiry', function () { Router::put('/finish/{order_inquiry_id:\d+}', [InquiryController::class, 'putFinishInquiry']); }); -// 未开发接口 - - - - - - -// 获取系统消息列表-系统消息 -Router::post('/20', [CallBackController::class, 'imCallBack']); - -// 获取服务、退款、福利、物流消息列表-系统消息 -Router::post('/21', [CallBackController::class, 'imCallBack']); - -// 消息已读-系统消息 -Router::post('/22', [CallBackController::class, 'imCallBack']); - -// 全部消息已读-系统消息-服务消息 -Router::post('/23', [CallBackController::class, 'imCallBack']); - - -// 获取问诊消息列表-消息 -Router::post('/24', [CallBackController::class, 'imCallBack']); - - -// 获取患者-医生关注状态 -Router::post('/26', [CallBackController::class, 'imCallBack']); - -// 获取患者简短问诊病例-聊天界面 -Router::post('/27', [CallBackController::class, 'imCallBack']); +// 获取弹窗数据 +Router::get('/popup', [InquiryController::class, 'getInquiryMessageBasic']); \ No newline at end of file