3
0
Fork 0

Compare commits

..

No commits in common. "ef9960a9ac5e15ceb2b869a29f832a78e3cc96f7" and "ac1f7bc81d5c1ebc9ad7cfad9892ce62b0ee49c7" have entirely different histories.

1 changed files with 1 additions and 5 deletions

View File

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