From 77a45f2c52ae73fcd4a3018175a944c1de7656ed Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Wed, 14 Jun 2023 21:23:11 +0800 Subject: [PATCH] fix --- .../com/ghy/web/controller/order/OrderDetailController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 0c14ac7a..09c93b3c 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -129,10 +129,10 @@ public class OrderDetailController extends BaseController { List financialMasters = financialMasterService.selectByOrderMasterIds(orderMasterIds); Map financialMasterMap = new HashMap<>(); if(0 == orderDetail.getSysPayStatus()){ - financialMasters + financialMasterMap = financialMasters .stream().filter(financialMaster->0 == financialMaster.getPayStatus()).collect(Collectors.toMap(FinancialMaster::getOrderMasterId, x -> x, (x, y) -> y)); }else { - financialMasters + financialMasterMap = financialMasters .stream().collect(Collectors.toMap(FinancialMaster::getOrderMasterId, x -> x, (x, y) -> y)); }