From 60c0d232038152fb6be9a2f579b74f2a837f0498 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Sat, 28 Nov 2020 14:35:42 +0800
Subject: [PATCH] 还原此接口
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java
index 27186ad..6ffcdd0 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java
@@ -662,19 +662,18 @@
*/
private ProductOrderDetail deductionDepartmentProduct(int consumCount, Long hospitalId, Long departmentId) {
UserProductDetail userProductDetail = productOrderDetailService.getUserProductDetail(hospitalId, departmentId);
- //合并集合 并将读片量=0的过滤掉
+ //合并集合
userProductDetail.getProductOrderJoinDetailListShare()
- .stream().filter(f->f.getAilightCount()>0).collect(Collectors.toList())
- .addAll(userProductDetail.getProductOrderJoinDetailsListDep()
- .stream().filter(f->f.getAilightCount()>0).collect(Collectors.toList()));
+ .addAll(userProductDetail.getProductOrderJoinDetailsListDep());
List<ProductOrderJoinDetail> productOrderJoinDetailList = userProductDetail.getProductOrderJoinDetailListShare();
if (productOrderJoinDetailList.size() > 0) {
//合并后按id排序并筛除已用完的套餐
List<ProductOrderJoinDetail> productOrderJoinDetailsNewList = productOrderJoinDetailList
- .stream().filter(f -> f.getAilightCount() >= consumCount)
- .sorted(Comparator.comparing(ProductOrderJoinDetail::getId)).collect(Collectors.toList());
+ .stream().filter(f -> f.getAilightCount() >= consumCount).collect(Collectors.toList());
//要使用的套餐信息
- ProductOrderDetail productOrderDetail = productOrderDetailService.getById(productOrderJoinDetailsNewList.get(0).getId());
+ Long firstId=productOrderJoinDetailsNewList.get(0).getId();
+ logger.info("扣费要使用的套餐ID是id:【{}】", firstId);
+ ProductOrderDetail productOrderDetail = productOrderDetailService.getById(firstId);
return productOrderDetail;
}
return null;
--
Gitblit v1.8.0