diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index c9798c9f..1d79cc05 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -795,9 +795,9 @@ public class OrderInfoServiceImpl extends ServiceImpl 0) { if (remaining.compareTo(BigDecimal.ZERO) > 0) { - if (isTimeDiscountShare && detail.getIsTimeDiscount() == 1) { - continue; - } +// if (isTimeDiscountShare && detail.getIsTimeDiscount() == 1) { +// continue; +// } if (remaining.compareTo(detail.getNum().subtract(detail.getReturnNum())) >= 0) { detail.setCouponNum(detail.getNum().subtract(detail.getReturnNum()).setScale(2, RoundingMode.CEILING)); detail.setDiscountAmount(detail.getPayAmount()); @@ -829,9 +829,9 @@ public class OrderInfoServiceImpl extends ServiceImpl 0 && detail.getNum().subtract(detail.getReturnNum()).subtract(detail.getCouponNum()).compareTo(BigDecimal.TWO) >= 0) { - if (isTimeDiscountShare && detail.getIsTimeDiscount() == 1) { - continue; - } +// if (isTimeDiscountShare && detail.getIsTimeDiscount() == 1) { +// continue; +// } detail.setCouponNum(detail.getCouponNum().add(BigDecimal.ONE)); detail.setDiscountAmount(detail.getDiscountAmount().add(detail.getUnitPrice())); detail.setPayAmount(detail.getPayAmount().subtract(detail.getUnitPrice())); @@ -851,9 +851,9 @@ public class OrderInfoServiceImpl extends ServiceImpl 0 && detail.getNum().subtract(detail.getReturnNum()).subtract(detail.getCouponNum()).compareTo(BigDecimal.TWO) >= 0) { - if (isTimeDiscountShare && detail.getIsTimeDiscount() == 1) { - continue; - } +// if (isTimeDiscountShare && detail.getIsTimeDiscount() == 1) { +// continue; +// } detail.setHalfPriceCouponNum(BigDecimal.ONE); BigDecimal halfPrice = detail.getUnitPrice().divide(new BigDecimal("2"), 2, RoundingMode.FLOOR); detail.setDiscountAmount(detail.getDiscountAmount().add(halfPrice));