## 空单会员升级订单报错处理;
This commit is contained in:
parent
5ddf4208ec
commit
69c5a8a0bf
|
@ -2648,10 +2648,18 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|
||||||
throw new ServiceException("当前已经是可以购买的最高等级");
|
throw new ServiceException("当前已经是可以购买的最高等级");
|
||||||
}
|
}
|
||||||
// 盒数基数 = 手动升级盒数 + 手动升级之后的升级订单盒数
|
// 盒数基数 = 手动升级盒数 + 手动升级之后的升级订单盒数
|
||||||
baseBoxNum = lastUpdateGrade.getBoxNumber().add(saOrderItemsService.getRetailWaresQuantityNew(cuMember.getPkId(), boxWaresList, lastMemberLevel.getUpgradeTime(), Collections.singletonList(EOrderType.RETAIL_UPGRADE.getValue()), systemType));
|
BigDecimal oldBoxNum = saOrderItemsService.getRetailWaresQuantityNew(cuMember.getPkId(), boxWaresList, lastMemberLevel.getUpgradeTime(), Collections.singletonList(EOrderType.RETAIL_UPGRADE.getValue()), systemType);
|
||||||
|
if (null != oldBoxNum) {
|
||||||
|
baseBoxNum = lastUpdateGrade.getBoxNumber().add(oldBoxNum);
|
||||||
|
} else {
|
||||||
|
baseBoxNum = lastUpdateGrade.getBoxNumber();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// 没有手动升级记录
|
// 没有手动升级记录
|
||||||
baseBoxNum = saOrderItemsService.getRetailWaresQuantityNew(cuMember.getPkId(), boxWaresList, null, Arrays.asList(EOrderType.RETAIL_REGISTER.getValue(), EOrderType.RETAIL_UPGRADE.getValue()), systemType);
|
BigDecimal oldBoxNum = saOrderItemsService.getRetailWaresQuantityNew(cuMember.getPkId(), boxWaresList, null, Arrays.asList(EOrderType.RETAIL_REGISTER.getValue(), EOrderType.RETAIL_UPGRADE.getValue()), systemType);
|
||||||
|
if (null != oldBoxNum) {
|
||||||
|
baseBoxNum = oldBoxNum;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return baseBoxNum;
|
return baseBoxNum;
|
||||||
|
|
Loading…
Reference in New Issue