From c7b5bb3f446d89bbf06e1ea80647a9dac391d00f Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 25 Aug 2025 12:05:50 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=92=A4=E5=8D=95=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BD=93=E5=89=8D=E8=AE=A2=E5=8D=95=E4=BA=A7?= =?UTF-8?q?=E7=94=9F=E7=9A=84=E8=B4=AD=E4=B9=B0=E5=8D=87=E7=BA=A7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/base/service/impl/CuMemberBusinessServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java index 3a8375e4..9f47a7ca 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java @@ -1708,7 +1708,8 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { if (CollectionUtil.isNotEmpty(memberLevelList)) { // 撤销的订单对应的升级记录 Optional orderLevelOpt = memberLevelList.stream().filter( - tmpLevel -> tmpLevel.getPkOrder().equals(saOrder.getPkId()) + tmpLevel -> null != tmpLevel.getPkOrder() + && tmpLevel.getPkOrder().equals(saOrder.getPkId()) && tmpLevel.getUpType().equals(EUpgradeType.BUY_UPGRADE.getValue()) ).findFirst(); if (orderLevelOpt.isPresent()) {