From aafd6169d841a90061a2a96ad77149975be8103d Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Mon, 07 Sep 2020 15:07:38 +0800
Subject: [PATCH] 修改 IsEnd 为 end 的bug 还有修改方法名
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 4 ++--
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java | 9 ++++++++-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/UserProductData.java | 2 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 9 +++++----
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/UserProductData.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/UserProductData.java
index b6796a6..59f6b2d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/UserProductData.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/UserProductData.java
@@ -14,7 +14,7 @@
/**
* 套餐是否到期
*/
- private boolean isEnd;
+ private Boolean isEnd;
/**
* 剩余天数
*/
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..7952d1d 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
@@ -68,7 +68,14 @@
UserProductDetail getUserProductDetail(Long hospitalId, Long departmentId);
ResultBody biUserNowProduct(Long hospitalId,Long departmentId);
- ResultBody<UserProductData> UserProductDetailData(Long hospitalId, Long departmentId,String diagnosticId);
+
+ /**
+ * 获取医院的到期时间
+ * @param hospitalId
+ * @param departmentId
+ * @return
+ */
+ ResultBody<UserProductData> userProductDetailData(Long hospitalId, Long departmentId,String diagnosticId);
/**
* 试用审核的列表
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
index be42aac..df69cd0 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
@@ -81,10 +81,11 @@
* @param diagnosticId
* @return
*/
- public ResultBody<UserProductData> UserProductDetailData(Long hospitalId,Long departmentId,String diagnosticId)
+ @Override
+ public ResultBody<UserProductData> userProductDetailData(Long hospitalId,Long departmentId,String diagnosticId)
{
UserProductData userProductData=new UserProductData();
- userProductData.setEnd(true);
+ userProductData.setIsEnd(true);
userProductData.setRecordCount(0);
userProductData.setAilightCount(0);
userProductData.setLimitDays(0);
@@ -94,7 +95,7 @@
userProductDetail.getProductOrderJoinDetailListShare().addAll(userProductDetail.getProductOrderJoinDetailsListDep());
List<ProductOrderJoinDetail> productOrderJoinDetailList = userProductDetail.getProductOrderJoinDetailListShare();
if (productOrderJoinDetailList.size() > 0) {
- userProductData.setEnd(false);
+ userProductData.setIsEnd(false);
//合并后按id排序并筛除已用完的套餐
List<ProductOrderJoinDetail> productOrderJoinDetailsNewList = productOrderJoinDetailList.stream().filter(f -> f.getAilightCount() >= 0).sorted(Comparator.comparing(ProductOrderJoinDetail::getProEndtime)).collect(Collectors.toList());
for (int i = 0; i <productOrderJoinDetailsNewList.size(); i++) {
@@ -117,7 +118,7 @@
}
}
//是否已经结束
- if (userProductData.isEnd()&& StringUtils.isNotBlank(diagnosticId)) {
+ if (userProductData.getIsEnd()&& StringUtils.isNotBlank(diagnosticId)) {
//写入redis中,防止扣非后不能生成报告
redisUtils.lSet(CommonConstant.SAAS_LAST_SERVER+diagnosticId,diagnosticId);
}
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 ab31f8c..2766441 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
@@ -158,7 +158,7 @@
@ApiOperation(value = "获取医院套餐是否到期和到期时间")
@GetMapping("/UserProductDetailData")
public ResultBody UserProductDetailData(@RequestParam Long hospitalId, @RequestParam Long departmentId,@RequestParam String diagnosticId) {
- return productOrderDetailService.UserProductDetailData(hospitalId, departmentId,diagnosticId);
+ return productOrderDetailService.userProductDetailData(hospitalId, departmentId,diagnosticId);
}
/**
@@ -172,7 +172,7 @@
@ApiOperation(value = "获取医院套餐是否到期和到期时间")
@PostMapping("/serviceperiod")
public ResultBody<UserProductData> ServicePeriod(@RequestBody HospitalInfo hospitalInfo) {
- return productOrderDetailService.UserProductDetailData(hospitalInfo.getHospitalId(), hospitalInfo.getDepartmentId(),hospitalInfo.getDiagnosticId());
+ return productOrderDetailService.userProductDetailData(hospitalInfo.getHospitalId(), hospitalInfo.getDepartmentId(),hospitalInfo.getDiagnosticId());
}
/**
--
Gitblit v1.8.0