From e613dc170308423742325db4a8bd9a3e01659add Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 19 Feb 2021 10:28:11 +0800
Subject: [PATCH] 增加合作商信息管理功能
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 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 4f25608..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
@@ -669,8 +669,7 @@
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());
//要使用的套餐信息
Long firstId=productOrderJoinDetailsNewList.get(0).getId();
logger.info("扣费要使用的套餐ID是id:【{}】", firstId);
--
Gitblit v1.8.0