From bdd5926a8d0f5dfad866de6b3e20b1ccf8e845f5 Mon Sep 17 00:00:00 2001 From: zxh <279049017@qq.com> Date: Mon, 07 Sep 2020 15:19:47 +0800 Subject: [PATCH] 修改 返回值和方法名 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 5 +++-- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java index 7952d1d..a4569b7 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java @@ -67,12 +67,19 @@ */ UserProductDetail getUserProductDetail(Long hospitalId, Long departmentId); + /** + * + * @param hospitalId + * @param departmentId + * @return + */ ResultBody biUserNowProduct(Long hospitalId,Long departmentId); /** * 获取医院的到期时间 * @param hospitalId * @param departmentId + * @param diagnosticId * @return */ ResultBody<UserProductData> userProductDetailData(Long hospitalId, Long departmentId,String diagnosticId); diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java index 2766441..856a219 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java @@ -152,12 +152,13 @@ * * @param hospitalId * @param departmentId + * @param diagnosticId * @return */ @ApiOperation(value = "获取医院套餐是否到期和到期时间") @GetMapping("/UserProductDetailData") - public ResultBody UserProductDetailData(@RequestParam Long hospitalId, @RequestParam Long departmentId,@RequestParam String diagnosticId) { + public ResultBody<UserProductData> serProductDetailData(@RequestParam Long hospitalId, @RequestParam Long departmentId,@RequestParam String diagnosticId) { return productOrderDetailService.userProductDetailData(hospitalId, departmentId,diagnosticId); } @@ -171,7 +172,7 @@ @ApiOperation(value = "获取医院套餐是否到期和到期时间") @PostMapping("/serviceperiod") - public ResultBody<UserProductData> ServicePeriod(@RequestBody HospitalInfo hospitalInfo) { + public ResultBody<UserProductData> servicePeriod(@RequestBody HospitalInfo hospitalInfo) { return productOrderDetailService.userProductDetailData(hospitalInfo.getHospitalId(), hospitalInfo.getDepartmentId(),hospitalInfo.getDiagnosticId()); } -- Gitblit v1.8.0