商品券 不抵扣临时菜
This commit is contained in:
@@ -675,7 +675,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||||||
// log.info("商品券 计算 orderDetails:{}", orderDetails);
|
// log.info("商品券 计算 orderDetails:{}", orderDetails);
|
||||||
BigDecimal remaining = new BigDecimal(discountNum);
|
BigDecimal remaining = new BigDecimal(discountNum);
|
||||||
for (OrderDetail detail : orderDetails) {
|
for (OrderDetail detail : orderDetails) {
|
||||||
if ((isAllFoods || couponFoodIds.contains(detail.getProductId())) && detail.getUnitPrice().compareTo(BigDecimal.ZERO) > 0) {
|
if (detail.getIsTemporary() != 1 && (isAllFoods || couponFoodIds.contains(detail.getProductId())) && detail.getUnitPrice().compareTo(BigDecimal.ZERO) > 0) {
|
||||||
if (remaining.compareTo(BigDecimal.ZERO) > 0) {
|
if (remaining.compareTo(BigDecimal.ZERO) > 0) {
|
||||||
if (remaining.compareTo(detail.getNum().subtract(detail.getReturnNum())) >= 0) {
|
if (remaining.compareTo(detail.getNum().subtract(detail.getReturnNum())) >= 0) {
|
||||||
detail.setCouponNum(detail.getNum().subtract(detail.getReturnNum()).setScale(2, RoundingMode.CEILING));
|
detail.setCouponNum(detail.getNum().subtract(detail.getReturnNum()).setScale(2, RoundingMode.CEILING));
|
||||||
|
|||||||
Reference in New Issue
Block a user