From c143d93014527f616aaaa7fe23ad91e3e9b6c7e3 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 14 Oct 2020 10:20:46 +0800
Subject: [PATCH] 扣费流程增加info日志

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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 be42aac..e9cca5e 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);
         }
@@ -213,6 +214,11 @@
         return PageResult.<ProductOrderDetail>builder().data(list).code(0).count(page.getTotal()).build();
     }
 
+    @Override
+    public int getUserdProduct(Long hospitalId, Long departmentId) {
+        return baseMapper.getUserdProduct(hospitalId,departmentId);
+    }
+
     /**
      * 获取诊断列表
      * @param params

--
Gitblit v1.8.0