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 | 20 ++++++++++++++++++--
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ConsumptionServiceFallbackFactory.java | 6 ++++++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalInfo.java | 9 +++++++++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ConsumptionService.java | 6 +++++-
4 files changed, 38 insertions(+), 3 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 a1b62be..811625f 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
@@ -3,6 +3,7 @@
import com.kidgrow.common.constant.ServiceNameConstants;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.oprationcenter.feign.fallback.ConsumptionServiceFallbackFactory;
+import com.kidgrow.oprationcenter.model.HospitalInfo;
import com.kidgrow.oprationcenter.vo.ConsumptionRequest;
import com.kidgrow.ribbon.config.FeignHttpInterceptorConfig;
import org.springframework.cloud.openfeign.FeignClient;
@@ -50,5 +51,8 @@
* @param departmentId
*/
@GetMapping(value = "productorderdetail/UserProductDetailData")
- ResultBody UserProductDetailData (@RequestParam Long hospitalId, Long departmentId);
+ ResultBody UserProductDetailData (@RequestParam("hospitalId") Long hospitalId, @RequestParam("departmentId") Long departmentId);
+
+ @PostMapping("/productorderdetail/serviceperiod")
+ ResultBody ServicePeriod(@RequestBody HospitalInfo hospitalInfo);
}
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 783eb51..b301660 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
@@ -2,6 +2,7 @@
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.oprationcenter.feign.ConsumptionService;
+import com.kidgrow.oprationcenter.model.HospitalInfo;
import com.kidgrow.oprationcenter.vo.ConsumptionRequest;
import feign.hystrix.FallbackFactory;
@@ -33,6 +34,11 @@
public ResultBody UserProductDetailData(Long hospitalId, Long departmentId) {
return ResultBody.failed().msg("UserProductDetailData的FeignClient调用失败");
}
+
+ @Override
+ public ResultBody ServicePeriod(HospitalInfo hospitalInfo) {
+ return ResultBody.failed().msg("getForecastHeight的FeignClient调用失败");
+ }
};
}
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalInfo.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalInfo.java
new file mode 100644
index 0000000..c5d6a95
--- /dev/null
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalInfo.java
@@ -0,0 +1,9 @@
+package com.kidgrow.oprationcenter.model;
+
+import lombok.Data;
+
+@Data
+public class HospitalInfo {
+ private Long hospitalId;
+ private Long departmentId;
+}
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 8ec3bf4..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;
/**
@@ -132,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