From acfb434519d6bb57557d588fc9cc895b80ecf1a2 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 15 May 2023 19:30:33 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E6=96=B0=E5=A2=9E=E3=80=81?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E5=8E=BB?= =?UTF-8?q?=E9=87=8D=E4=BC=98=E5=85=88=E5=8F=96=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseservice/module/buyer/service/impl/BuyerServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java index 47a9387d..5c9e0c69 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java @@ -448,7 +448,7 @@ public class BuyerServiceImpl implements BuyerService { } String buyerId = baseService.getGenerateShotKey(); if (CollectionUtil.isNotEmpty(buyerEntity.getBuyerEntityDetail())) { - Map collect = buyerEntity.getBuyerEntityDetail().stream().collect(Collectors.toMap(t -> t.getAddress() + t.getPhone() + t.getBankName() + t.getBankAccount(), t -> t,(t1, t2) -> t2)); + Map collect = buyerEntity.getBuyerEntityDetail().stream().sorted((t1,t2)->Integer.valueOf(t2.getDefaultMark()) - Integer.valueOf(t1.getDefaultMark())).collect(Collectors.toMap(t -> t.getAddress() + t.getPhone() + t.getBankName() + t.getBankAccount(), t -> t,(t1, t2) -> t2)); List collect1 = collect.values().stream().collect(Collectors.toList()); buyerEntity.setBuyerEntityDetail(collect1); for (BuyerEntityDetail t : buyerEntity.getBuyerEntityDetail()) {