3
0
Fork 0

Compare commits

...

3 Commits

1 changed files with 5 additions and 1 deletions

View File

@ -899,6 +899,9 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
.set(CuMemberRetailRegion::getModifiedTime, currentDateTime) .set(CuMemberRetailRegion::getModifiedTime, currentDateTime)
); );
} }
// 删除购买升级的升级记录
iCuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime);
} }
// 更新会员标记如果是则更新会员信息 // 更新会员标记如果是则更新会员信息
@ -1705,7 +1708,8 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
if (CollectionUtil.isNotEmpty(memberLevelList)) { if (CollectionUtil.isNotEmpty(memberLevelList)) {
// 撤销的订单对应的升级记录 // 撤销的订单对应的升级记录
Optional<CuMemberLevel> orderLevelOpt = memberLevelList.stream().filter( Optional<CuMemberLevel> 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()) && tmpLevel.getUpType().equals(EUpgradeType.BUY_UPGRADE.getValue())
).findFirst(); ).findFirst();
if (orderLevelOpt.isPresent()) { if (orderLevelOpt.isPresent()) {