|
@@ -246,18 +246,15 @@ public class ApiOrderNewServiceImpl implements ApiOrderNewService {
|
|
if (couponDto != null && !isDadaOrder) {
|
|
if (couponDto != null && !isDadaOrder) {
|
|
if (couponDto.getType().equals(CouponTypeEnum.MAN_JIAN.type)) {
|
|
if (couponDto.getType().equals(CouponTypeEnum.MAN_JIAN.type)) {
|
|
if (order.getTotalAmount().add(couponDto.getMoney()).compareTo(couponDto.getLimitFee()) >= 0 && !isMine) {
|
|
if (order.getTotalAmount().add(couponDto.getMoney()).compareTo(couponDto.getLimitFee()) >= 0 && !isMine) {
|
|
- log.info("进入满减券!");
|
|
|
|
order.setCouponAmount(couponDto.getMoney());
|
|
order.setCouponAmount(couponDto.getMoney());
|
|
order.setCouponId(Long.valueOf(couponDto.getId()));
|
|
order.setCouponId(Long.valueOf(couponDto.getId()));
|
|
couponDto.setStatus(MemberCouponStatusEnum.USED.getStatus());
|
|
couponDto.setStatus(MemberCouponStatusEnum.USED.getStatus());
|
|
}
|
|
}
|
|
} else if (couponDto.getType().equals(CouponTypeEnum.LI_JIAN.type) && !isMine) {
|
|
} else if (couponDto.getType().equals(CouponTypeEnum.LI_JIAN.type) && !isMine) {
|
|
- log.info("进入立减券!");
|
|
|
|
order.setCouponAmount(couponDto.getMoney());
|
|
order.setCouponAmount(couponDto.getMoney());
|
|
order.setCouponId(Long.valueOf(couponDto.getId()));
|
|
order.setCouponId(Long.valueOf(couponDto.getId()));
|
|
couponDto.setStatus(MemberCouponStatusEnum.USED.getStatus());
|
|
couponDto.setStatus(MemberCouponStatusEnum.USED.getStatus());
|
|
} else if (couponDto.getType().equals(CouponTypeEnum.ZHE_KOU.type) && !isMine) {
|
|
} else if (couponDto.getType().equals(CouponTypeEnum.ZHE_KOU.type) && !isMine) {
|
|
- log.info("进入折扣券!");
|
|
|
|
BigDecimal discount = order.getTotalAmount().multiply(couponDto.getDiscount()).divide(BigDecimal.TEN).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
BigDecimal discount = order.getTotalAmount().multiply(couponDto.getDiscount()).divide(BigDecimal.TEN).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
if ((order.getTotalAmount().subtract(discount)).compareTo(couponDto.getMaxDiscount()) > 0) {
|
|
if ((order.getTotalAmount().subtract(discount)).compareTo(couponDto.getMaxDiscount()) > 0) {
|
|
discount = order.getTotalAmount().subtract(couponDto.getMaxDiscount());
|
|
discount = order.getTotalAmount().subtract(couponDto.getMaxDiscount());
|