From a18dde79b1d35bbba46d5f68512dbb617bbc4ecd Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Fri, 28 Aug 2020 16:21:35 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
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 a672c0a..96cba5a 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
@@ -2,9 +2,11 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.model.*;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.common.utils.DateUtils;
+import com.kidgrow.common.utils.StringUtils;
import com.kidgrow.oprationcenter.feign.DiagnosticService;
import com.kidgrow.oprationcenter.mapper.ConsumptionRecordMapper;
import com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper;
@@ -14,6 +16,7 @@
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
import com.kidgrow.oprationcenter.vo.*;
+import com.kidgrow.redis.util.RedisUtils;
import com.kidgrow.usercenter.feign.SysDoctorService;
import com.kidgrow.usercenter.feign.SysHospitalService;
import com.kidgrow.usercenter.model.SysHospital;
@@ -48,6 +51,8 @@
private ConsumptionRecordMapper consumptionRecordMapper;
@Autowired
private IProductOrderService iProductOrderService;
+ @Autowired
+ private RedisUtils redisUtils;
/**
* 列表
* @param params
@@ -73,9 +78,10 @@
* 判定医院科室的套餐是否到期 以及到期时间
* @param hospitalId
* @param departmentId
+ * @param diagnosticId
* @return
*/
- public ResultBody<UserProductData> UserProductDetailData(Long hospitalId,Long departmentId)
+ public ResultBody<UserProductData> UserProductDetailData(Long hospitalId,Long departmentId,String diagnosticId)
{
UserProductData userProductData=new UserProductData();
userProductData.setEnd(true);
@@ -91,6 +97,11 @@
userProductData.setMaxEndTime(productOrderJoinDetailsNewList.get(0).getProEndtime());
}
}
+ //是否已经结束
+ if (userProductData.isEnd()&& StringUtils.isNotBlank(diagnosticId)) {
+ //写入redis中,防止扣非后不能生成报告
+ redisUtils.lSet(CommonConstant.SAAS_LAST_SERVER+diagnosticId,diagnosticId);
+ }
return ResultBody.ok().data(userProductData);
}
--
Gitblit v1.8.0