From 17112a33c4c154237fd0a07fc636d16c6e590fcd Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 22 Jul 2020 18:52:55 +0800
Subject: [PATCH] 增加获取当前医院套餐的feign调用
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html | 2 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ConsumptionServiceFallbackFactory.java | 13 +++++++++----
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ConsumptionService.java | 11 +++++++++++
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ConsumptionService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ConsumptionService.java
index 748bbfb..a1b62be 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ConsumptionService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ConsumptionService.java
@@ -6,8 +6,10 @@
import com.kidgrow.oprationcenter.vo.ConsumptionRequest;
import com.kidgrow.ribbon.config.FeignHttpInterceptorConfig;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -40,4 +42,13 @@
*/
@PostMapping(value = "consumption/Artificial")
ResultBody consumptionArtificial (@RequestBody ConsumptionRequest consumptionRequest);
+ /**
+ * 获取医院套餐是否到期和到期时间
+ * data内 isend为true说明套餐到期
+ * endtime上套餐的到期时间
+ * @param hospitalId
+ * @param departmentId
+ */
+ @GetMapping(value = "productorderdetail/UserProductDetailData")
+ ResultBody UserProductDetailData (@RequestParam Long hospitalId, Long departmentId);
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ConsumptionServiceFallbackFactory.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ConsumptionServiceFallbackFactory.java
index 2a0c0ea..783eb51 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ConsumptionServiceFallbackFactory.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ConsumptionServiceFallbackFactory.java
@@ -11,22 +11,27 @@
return new ConsumptionService() {
@Override
public ResultBody consumptionAIStart(ConsumptionRequest consumptionRequest) {
- return ResultBody.failed().msg("consumptionAIStart的FeignClient调用参数传递测试失败");
+ return ResultBody.failed().msg("consumptionAIStart的FeignClient调用失败");
}
@Override
public ResultBody consumptionAIReturn(ConsumptionRequest consumptionRequest) {
- return ResultBody.failed().msg("consumptionAIReturn的FeignClient调用参数传递测试失败");
+ return ResultBody.failed().msg("consumptionAIReturn的FeignClient调用失败");
}
@Override
public ResultBody consumptionAIFail(ConsumptionRequest consumptionRequest) {
- return ResultBody.failed().msg("consumptionAIFail的FeignClient调用参数传递测试失败");
+ return ResultBody.failed().msg("consumptionAIFail的FeignClient调用失败");
}
@Override
public ResultBody consumptionArtificial(ConsumptionRequest consumptionRequest) {
- return ResultBody.failed().msg("consumptionArtificial的FeignClient调用参数传递测试失败");
+ return ResultBody.failed().msg("consumptionArtificial的FeignClient调用失败");
+ }
+
+ @Override
+ public ResultBody UserProductDetailData(Long hospitalId, Long departmentId) {
+ return ResultBody.failed().msg("UserProductDetailData的FeignClient调用失败");
}
};
}
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
index bf2bdfd..46041b2 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
@@ -328,7 +328,7 @@
serverUserTel: $("#serverUserTel").val(),
departmentName: $("#departmentName").val(),
id: $("#departmentId").val(),
- orgId: $("#departmentOrgId").val(),
+ orgId: ''+$("#departmentOrgId").val(),
updateUserId: data.data.orgId,
hospitalId: data.data.id,
saleUserId: $("#saleUserName").val(),
--
Gitblit v1.8.0