修改模板下载

dougang

2020-12-18 93cec81bc04d7722e8c82d699f434709d5dd47ce

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java

@@ -669,10 +669,11 @@
        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;