From 80d41f37832aa385798b2e53f9daae68224cdfe4 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 13 Oct 2025 14:27:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E8=B4=AD=E4=B9=B0=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=AE=9A=E4=BB=B7=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=97=B6=E9=95=BF=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/funds/purchase/PurchaseServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java index 0fa347f0a..b71788697 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java @@ -45,6 +45,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Optional; @@ -348,7 +349,7 @@ public class PurchaseServiceImpl implements PurchaseService { BigDecimal totalAmount = orgInitialPurchaseRecord.getTotalAmount(); // 定价中有的，以年数量*组织定价*折扣展示 List productDetailRespVOList = new ArrayList<>(); - for (ProductsDetailDO detailDO : page.getList()) { + for (ProductsDetailDO detailDO : page.getList().stream().sorted(Comparator.comparingInt(ProductsDetailDO::getDuration)).collect(Collectors.toList())) { ProductDetailsRespVO newDetailRespVO = BeanUtils.toBean(detailDO, ProductDetailsRespVO.class); // 折扣 BigDecimal discount = detailDO.getDiscount(); @@ -416,7 +417,7 @@ public class PurchaseServiceImpl implements PurchaseService { BigDecimal monthAverageAmount = totalAmount.divide(new BigDecimal(10), 2, RoundingMode.DOWN); List productDetailRespVOList = new ArrayList<>(); - for (ProductsDetailDO detailDO : productsDetailDOS) { + for (ProductsDetailDO detailDO : productsDetailDOS.stream().sorted(Comparator.comparingInt(ProductsDetailDO::getDuration)).collect(Collectors.toList())) { ProductDetailsRespVO newDetailRespVO = BeanUtils.toBean(detailDO, ProductDetailsRespVO.class); // 折扣 BigDecimal discount = detailDO.getDiscount();