forked from angelo/java-retail-app
Compare commits
No commits in common. "ef9960a9ac5e15ceb2b869a29f832a78e3cc96f7" and "ac1f7bc81d5c1ebc9ad7cfad9892ce62b0ee49c7" have entirely different histories.
ef9960a9ac
...
ac1f7bc81d
|
|
@ -899,9 +899,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
|
||||||
.set(CuMemberRetailRegion::getModifiedTime, currentDateTime)
|
.set(CuMemberRetailRegion::getModifiedTime, currentDateTime)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 删除购买升级的升级记录
|
|
||||||
iCuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 更新会员标记,如果是则更新会员信息
|
// 更新会员标记,如果是则更新会员信息
|
||||||
|
|
@ -1708,8 +1705,7 @@ 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 -> null != tmpLevel.getPkOrder()
|
tmpLevel -> tmpLevel.getPkOrder().equals(saOrder.getPkId())
|
||||||
&& 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()) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue