## 自助撤单删除加购升级记录;
This commit is contained in:
parent
8c97479b1c
commit
5812c59852
|
|
@ -2298,7 +2298,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
||||||
// 撤销注册订单(注册订单,海粉订单,特殊注册订单)
|
// 撤销注册订单(注册订单,海粉订单,特殊注册订单)
|
||||||
if (myOrderVO.getOrderType() == EOrderType.REGISTER_ORDER.getValue()
|
if (myOrderVO.getOrderType() == EOrderType.REGISTER_ORDER.getValue()
|
||||||
|| myOrderVO.getOrderType() == EOrderType.SPECIAL_REGISTER_ORDER.getValue()
|
|| myOrderVO.getOrderType() == EOrderType.SPECIAL_REGISTER_ORDER.getValue()
|
||||||
|| (myOrderVO.getOrderType() == EOrderType.REPURCHASE_ORDER.getValue() && EOrderTypeExtend.REG_REP.getValue() == saOrderExt.getOrderTypeExtend())
|
|| (myOrderVO.getOrderType() == EOrderType.REPURCHASE_ORDER.getValue() && EOrderTypeExtend.REG_REP.getValue().equals(saOrderExt.getOrderTypeExtend()))
|
||||||
) {
|
) {
|
||||||
// 逻辑删除会员
|
// 逻辑删除会员
|
||||||
if (!iMemberServiceApi.singleRevokeMemberBySelfRevokeOrder(pkApprove, saOrderExt, businessCommissionDTO).getData()) {
|
if (!iMemberServiceApi.singleRevokeMemberBySelfRevokeOrder(pkApprove, saOrderExt, businessCommissionDTO).getData()) {
|
||||||
|
|
@ -2388,6 +2388,14 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
||||||
|
|
||||||
cuMember.setConsumeAchieve(gradeDTO.getStartValue());
|
cuMember.setConsumeAchieve(gradeDTO.getStartValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 删除加购升级数据
|
||||||
|
iAcAddUpgradeRecordService.update(Wrappers.<AcAddUpgradeRecord>lambdaUpdate()
|
||||||
|
.eq(AcAddUpgradeRecord::getPkMember,saOrderExt.getPkMember())
|
||||||
|
.eq(AcAddUpgradeRecord::getPkOrderId, saOrderExt.getPkId())
|
||||||
|
.eq(AcAddUpgradeRecord::getDelFlag, EDelFlag.UN_DELETE.getValue())
|
||||||
|
.set(AcAddUpgradeRecord::getDelFlag, EDelFlag.DELETE.getValue())
|
||||||
|
);
|
||||||
} else if (myOrderVO.getOrderType() == EOrderType.PICK_ORDER.getValue()) {
|
} else if (myOrderVO.getOrderType() == EOrderType.PICK_ORDER.getValue()) {
|
||||||
//提货订单退还提货数量
|
//提货订单退还提货数量
|
||||||
if (!iAcPickService.cancelPickOrder(saOrderExt.getOrderCode(), pkApprove)) {
|
if (!iAcPickService.cancelPickOrder(saOrderExt.getOrderCode(), pkApprove)) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue