From 8e302d52b67d30fe64a95095565cc39569d1f1c3 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 27 Nov 2020 16:13:21 +0800
Subject: [PATCH] 配合新的套餐功能，修正套餐的扣款顺序
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java | 11 ++++++++---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 3 ++-
2 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/ConsumptionRecordServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java
index 20b935b..27186ad 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,12 +662,17 @@
*/
private ProductOrderDetail deductionDepartmentProduct(int consumCount, Long hospitalId, Long departmentId) {
UserProductDetail userProductDetail = productOrderDetailService.getUserProductDetail(hospitalId, departmentId);
- //合并集合
- userProductDetail.getProductOrderJoinDetailListShare().addAll(userProductDetail.getProductOrderJoinDetailsListDep());
+ //合并集合 并将读片量=0的过滤掉
+ userProductDetail.getProductOrderJoinDetailListShare()
+ .stream().filter(f->f.getAilightCount()>0).collect(Collectors.toList())
+ .addAll(userProductDetail.getProductOrderJoinDetailsListDep()
+ .stream().filter(f->f.getAilightCount()>0).collect(Collectors.toList()));
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());
+ List<ProductOrderJoinDetail> productOrderJoinDetailsNewList = productOrderJoinDetailList
+ .stream().filter(f -> f.getAilightCount() >= consumCount)
+ .sorted(Comparator.comparing(ProductOrderJoinDetail::getId)).collect(Collectors.toList());
//要使用的套餐信息
ProductOrderDetail productOrderDetail = productOrderDetailService.getById(productOrderJoinDetailsNewList.get(0).getId());
return productOrderDetail;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
index c419e42..889e2f4 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
@@ -170,8 +170,9 @@
<include refid="whereforall"/>
order by
DE.pro_endtime ASC,
+ DE.ailight_count ASC,
DE.pro_begintime ASC,
- DE.id asc
+ DE.id ASC
</select>
<select id="getEnabledCount" resultType="int" parameterType="long">
--
Gitblit v1.8.0