From a04d76dc568b4a13455ea6ca4ae2a92e6387736d Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Wed, 25 Nov 2020 16:36:14 +0800 Subject: [PATCH] Merge branch 'development' into dev --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISaasClientPayService.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISaasClientPayService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISaasClientPayService.java index c28792a..4e83c39 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISaasClientPayService.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISaasClientPayService.java @@ -2,11 +2,13 @@ import com.kidgrow.common.model.PageResult; +import com.kidgrow.common.model.ResultBody; import com.kidgrow.common.service.ISuperService; import com.kidgrow.oprationcenter.model.SaasClientPay; import com.kidgrow.oprationcenter.vo.SaasClientPayExcel; import com.kidgrow.oprationcenter.vo.SaasClientPayVo; +import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; @@ -33,6 +35,7 @@ * @return SaasClientPay对象 */ SaasClientPay findByObject(SaasClientPay saasClientPay); + SaasClientPay findModelByObject(Long hospitalId,Long departmentId,String diaId); /** * 批量结算 * @param list @@ -44,5 +47,13 @@ */ List<SaasClientPayExcel> export(Map<String, Object> params); + + /** + * 获取微信和支付宝的二维码 + * @param saasClientPay + * @param request + * @return + */ + ResultBody getCode(SaasClientPay saasClientPay,HttpServletRequest request) throws Exception; } -- Gitblit v1.8.0