From 091e76cc847ec382d3a0a314bd2b2c874fb63bde Mon Sep 17 00:00:00 2001 From: bingbing <zhaobingliang@aliyun.com> Date: Thu, 23 Jul 2020 13:03:33 +0800 Subject: [PATCH] 套餐过期修改 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 37 ++++++++++++++++++++++++++++++++++--- 1 files changed, 34 insertions(+), 3 deletions(-) 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 4200a39..ab994bf 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 @@ -6,6 +6,7 @@ import com.kidgrow.common.model.ResultBody; import com.kidgrow.common.model.SysOrganization; import com.kidgrow.common.model.SysUser; +import com.kidgrow.oprationcenter.model.HospitalInfo; import com.kidgrow.oprationcenter.model.ProductOrderDetail; import com.kidgrow.oprationcenter.model.ProductOrderRecord; import com.kidgrow.oprationcenter.service.IBusinessRecordsService; @@ -27,7 +28,9 @@ import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** @@ -69,7 +72,22 @@ } return productOrderDetailService.findList(params); } - + /** + * 列表 + */ + @ApiOperation(value = "查询列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer") + }) + @GetMapping("all") + public PageResult all(@RequestParam Map<String, Object> params) { + if (params.size() == 0) { + params.put("page", 1); + params.put("limit", 10); + } + return productOrderDetailService.all(params); + } /** * 列表 */ @@ -117,11 +135,24 @@ @ApiOperation(value = "获取医院套餐是否到期和到期时间") @GetMapping("/UserProductDetailData") - public ResultBody UserProductDetailData(@RequestParam Long hospitalId,Long departmentId) { + public ResultBody UserProductDetailData(@RequestParam Long hospitalId,@RequestParam Long departmentId) { return productOrderDetailService.UserProductDetailData(hospitalId,departmentId); } /** + * 获取医院套餐是否到期和到期时间 + * data内 isend为true说明套餐到期 + * endtime上套餐的到期时间 + * @return + */ + + @ApiOperation(value = "获取医院套餐是否到期和到期时间") + @PostMapping("/serviceperiod") + public ResultBody ServicePeriod(@RequestBody HospitalInfo hospitalInfo) { + return productOrderDetailService.UserProductDetailData(hospitalInfo.getHospitalId(),hospitalInfo.getDepartmentId()); + } + + /** * 查询 */ @ApiOperation(value = "查询") -- Gitblit v1.8.0