This commit is contained in:
wucongxing 2023-04-01 09:42:53 +08:00
parent 9ef8ebff50
commit c76055dd13
4 changed files with 81 additions and 17 deletions

View File

@ -75,13 +75,13 @@ class MessageNoticeController extends AbstractController
}
/**
* 获取患者系统消息通知最后一条消息列表
* 获取患者系统消息通知列表
* @return ResponseInterface
*/
public function getPatientMessageServiceLast(): ResponseInterface
public function getPatientMessageServiceListLast(): ResponseInterface
{
$MessageNoticeService = new MessageNoticeService();
$data = $MessageNoticeService->getPatientMessageServiceLast();
$data = $MessageNoticeService->getPatientMessageServiceListLast();
return $this->response->json($data);
}
@ -100,4 +100,15 @@ class MessageNoticeController extends AbstractController
$data = $MessageNoticeService->getPatientMessageSystem();
return $this->response->json($data);
}
/**
* 获取患者系统消息通知最后一条消息
* @return ResponseInterface
*/
public function getPatientMessageServiceLast(): ResponseInterface
{
$MessageNoticeService = new MessageNoticeService();
$data = $MessageNoticeService->getPatientMessageServiceLast();
return $this->response->json($data);
}
}

View File

@ -31,7 +31,7 @@ class TestController extends AbstractController
{
public function test(){
// $this->test_8();
// $this->test_3();
$this->test_3();
// $this->test_4();
// $this->test_6();
// $this->test_9();
@ -39,7 +39,7 @@ class TestController extends AbstractController
// $this->test_11();
// $this->test_5();
// $this->test_1();
$this->test_11();
// $this->test_11();
}
// 获取云证书-首次
@ -149,6 +149,35 @@ class TestController extends AbstractController
public function test_3(){
$ca = new Ca();
// // 下载阿里云图片
// $oss = new Oss();
//
// $filename = "applet/doctor/cert/f2abdb81-fac0-4264-bc11-aa2b6cf2761c.png";
//
// $style = "image/resize,m_lfit,w_100,h_350";
//
// $sign_image = $oss->getCusTomObjectToRAM($filename,$style);
// $sign_image = base64_encode($sign_image);
// if (!$sign_image){
// return fail(HttpEnumCode::SERVER_ERROR);
// }
//
// $sign_param = [
// [
// "llx"=> "500", // 左边底部X坐标
// "lly"=>"3015", // 左边底部Y坐标
// "urx"=>"850", // 右边上部x坐标
// "ury"=>"3115", // 右边上部y坐标
// "pageList"=>[1],
// "sealImg"=>$sign_image
// ]
// ];
// $data = array();
// $data['sign_param'] = json_encode($sign_param);
// $data['seal_img'] = $sign_image;
//
// $result = $ca->addUserSignConfig("491925054435950592","410323199603261241",$data);
// 下载阿里云图片
$oss = new Oss();
@ -164,10 +193,10 @@ class TestController extends AbstractController
$sign_param = [
[
"llx"=> "500", // 左边底部X坐标
"lly"=>"3015", // 左边底部Y坐标
"urx"=>"850", // 右边上部x坐标
"ury"=>"3115", // 右边上部y坐标
"llx"=>"350", // 左边底部X坐标
"lly"=>"190", // 左边底部Y坐标
"urx"=>"440", // 右边上部x坐标
"ury"=>"140", // 右边上部y坐标
"pageList"=>[1],
"sealImg"=>$sign_image
]
@ -176,7 +205,7 @@ class TestController extends AbstractController
$data['sign_param'] = json_encode($sign_param);
$data['seal_img'] = $sign_image;
$result = $ca->addUserSignConfig("491925054435950592","410323199603261241",$data);
$result = $ca->addUserSignConfig("534534546","410323199603261240",$data);
}
// 获取用户签章图片

View File

@ -198,10 +198,10 @@ class MessageNoticeService extends BaseService
}
/**
* 获取患者系统消息通知最后一条消息列表
* 获取患者系统消息通知列表
* @return array
*/
public function getPatientMessageServiceLast(): array
public function getPatientMessageServiceListLast(): array
{
$user_info = $this->request->getAttribute("userInfo") ?? [];
@ -223,7 +223,6 @@ class MessageNoticeService extends BaseService
// 福利消息
$params = array();
$params['user_id'] = $user_info['user_id'];
$params['user_id'] = 1;
$params['user_type'] = 1;
$params['notice_type'] = 3; // 消息类型1:医生服务通知 2:医生系统公告 3:患者系统消息
$params['notice_system_type'] = 2; // 系统消息类型(患者端系统消息存在 1:服务消息 2:福利消息 3:退款消息 4:物流消息)
@ -236,7 +235,6 @@ class MessageNoticeService extends BaseService
// 退款消息
$params = array();
$params['user_id'] = $user_info['user_id'];
$params['user_id'] = 1;
$params['user_type'] = 1;
$params['notice_type'] = 3; // 消息类型1:医生服务通知 2:医生系统公告 3:患者系统消息
$params['notice_system_type'] = 3; // 系统消息类型(患者端系统消息存在 1:服务消息 2:福利消息 3:退款消息 4:物流消息)
@ -249,7 +247,6 @@ class MessageNoticeService extends BaseService
// 物流消息
$params = array();
$params['user_id'] = $user_info['user_id'];
$params['user_id'] = 1;
$params['user_type'] = 1;
$params['notice_type'] = 3; // 消息类型1:医生服务通知 2:医生系统公告 3:患者系统消息
$params['notice_system_type'] = 4; // 系统消息类型(患者端系统消息存在 1:服务消息 2:福利消息 3:退款消息 4:物流消息)
@ -301,4 +298,28 @@ class MessageNoticeService extends BaseService
return success($result);
}
/**
* 获取患者系统消息通知最后一条消息
* @return array
*/
public function getPatientMessageServiceLast(): array
{
$user_info = $this->request->getAttribute("userInfo") ?? [];
$result = array();
// 服务消息
$params = array();
$params['user_id'] = $user_info['user_id'];
$params['user_type'] = 1;
$params['notice_type'] = 3; // 消息类型1:医生服务通知 2:医生系统公告 3:患者系统消息
$params['send_status'] = 1;
$result['service']['info'] = MessageNotice::getOrderOne($params,'notice_send_time',['*']);
$params['read_status'] = 0;
$result['service']['count'] = MessageNotice::getCount($params);
return success($result);
}
}

View File

@ -395,11 +395,14 @@ Router::addGroup('/patient', function () {
// 消息通知
Router::addGroup('/message', function () {
// 获取患者系统消息通知最后一条消息列表
Router::get('/system/last', [MessageNoticeController::class, 'getPatientMessageServiceLast']);
// 获取患者系统消息通知列表
Router::get('/system/list-last', [MessageNoticeController::class, 'getPatientMessageServiceListLast']);
// 获取患者服务、福利、退款、物流消息通知列表-分页
Router::get('/system', [MessageNoticeController::class, 'getPatientMessageSystem']);
// 获取患者系统消息通知最后一条消息
Router::get('/system/last', [MessageNoticeController::class, 'getPatientMessageServiceLast']);
});
});