From 90f2acaa6c61d5a60822d4fee5a44ec3c5404f67 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 18:52:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/PayManagerController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/PayManagerController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/PayManagerController.java
index 5103774..dc029ef 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/PayManagerController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/PayManagerController.java
@@ -16,6 +16,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
@@ -118,6 +119,29 @@
return ResultBody.ok().data(true).msg("已开通单次支付功能");
}
}
+ /**
+ * 查询一个科室是否有支付功能
+ */
+ @ApiOperation(value = "查询一个科室是否有支付功能")
+ @PostMapping("/departmentIsPayFegin")
+ public ResultBody departmentIsPayFegin(@RequestBody Map<String,Long> map) {
+ Long hospitalId = MapUtils.getLong(map, "hospitalId");
+ if(hospitalId==null){
+ return ResultBody.failed("请输入医院id");
+ }
+ Long departmentId = MapUtils.getLong(map, "departmentId");
+ if(departmentId==null){
+ return ResultBody.failed("请输入部门id");
+ }
+ PayManager payManager=payManagerService.findByObject(hospitalId,departmentId);
+ if (payManager.getId() == null) {
+ return ResultBody.ok().data(false).msg("未开通单次支付功能");
+ }
+ else
+ {
+ return ResultBody.ok().data(true).msg("已开通单次支付功能");
+ }
+ }
/**
* 新增or更新
@@ -160,9 +184,11 @@
}
else if(modelDetail==null)
{
- Boolean isResult=payManagerService.saveproductOrder(payManager,sysUser);
- if (!isResult) {
- return ResultBody.failed().msg("套餐充入失败,支付开通失败！");
+ if(payManager.getEnabled()){
+ Boolean isResult=payManagerService.saveproductOrder(payManager,sysUser);
+ if (!isResult) {
+ return ResultBody.failed().msg("套餐充入失败,支付开通失败！");
+ }
}
}
} else {
--
Gitblit v1.8.0