From 34589cd092e0de8cfd704cd59608ed0f36f6093a Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Mon, 26 Oct 2020 09:56:30 +0800
Subject: [PATCH] Merge branch 'pay_master' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 bc8ad11..57353ef 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,8 +67,22 @@
*/
UserProductDetail getUserProductDetail(Long hospitalId, Long departmentId);
+ /**
+ *
+ * @param hospitalId
+ * @param departmentId
+ * @return
+ */
ResultBody biUserNowProduct(Long hospitalId,Long departmentId);
- ResultBody<UserProductData> UserProductDetailData(Long hospitalId, Long departmentId,String diagnosticId);
+
+ /**
+ * 获取医院的到期时间
+ * @param hospitalId
+ * @param departmentId
+ * @param diagnosticId
+ * @return
+ */
+ ResultBody<UserProductData> userProductDetailData(Long hospitalId, Long departmentId,String diagnosticId);
/**
* 试用审核的列表
@@ -117,5 +131,17 @@
* @return
*/
PageResult<ProductOrderDetail> departmentProductDetail(Map<String, Object> params);
+ /**
+ * 获取最近即将到期的套餐
+ * @return
+ */
+ PageResult<ProductEndVo>productEndList(Map<String, Object> params);
+ /**
+ * 获取一个科室所有的有效套餐
+ * @param departmentId
+ * hospitalId
+ * @return
+ */
+ int getUserdProduct(Long hospitalId,Long departmentId);
}
--
Gitblit v1.8.0