forked from kidgrow-microservices-platform
blame | history | patch | commit | commitdiff | ignore whitespace
zhaoxiaohao
2020-12-09 b92f672511421c4f1b673242ef6ac5b186d10d1a 
 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);