From c8e56594e03e0e7d0bf9c34e3375d95b34cf9c54 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 27 Nov 2020 18:09:07 +0800
Subject: [PATCH] 配合新的套餐功能，修正套餐的扣款顺序（修复）
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..4f25608 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,11 +662,9 @@
*/
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排序并筛除已用完的套餐
@@ -674,7 +672,9 @@
.stream().filter(f -> f.getAilightCount() >= consumCount)
.sorted(Comparator.comparing(ProductOrderJoinDetail::getId)).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