新客立减 0的情况
This commit is contained in:
parent
629cb43741
commit
c34a1d1f88
|
|
@ -826,7 +826,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||
log.info("订单处理过,payment id:{}", payment.getId());
|
||||
return;
|
||||
}
|
||||
payment.setTradeNumber( czgCallBackDto.getPayOrderId());
|
||||
payment.setTradeNumber(czgCallBackDto.getPayOrderId());
|
||||
payment.setRespJson(resultJson.toString());
|
||||
paymentService.updateById(payment);
|
||||
|
||||
|
|
@ -968,7 +968,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||
}
|
||||
} else {
|
||||
//新客立减
|
||||
if (orderInfo.getNewCustomerDiscountAmount() != null) {
|
||||
if (orderInfo.getNewCustomerDiscountAmount() != null && orderInfo.getNewCustomerDiscountAmount().compareTo(BigDecimal.ZERO) > 0) {
|
||||
newConsumerDiscountRecordService.useDiscount(shopUser.getId(), orderInfo.getId(), orderInfo.getNewCustomerDiscountAmount());
|
||||
}
|
||||
//积分使用
|
||||
|
|
@ -1157,7 +1157,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
|
|||
orderInfo.setStatus(OrderStatusEnums.DONE.getCode());
|
||||
if (param.getPointsDiscountAmount().compareTo(BigDecimal.ZERO) > 0) {
|
||||
orderInfo.setPayType(PayEnums.VIP_PAY.getValue());
|
||||
}else {
|
||||
} else {
|
||||
orderInfo.setPayType(PayEnums.CASH_PAY.getValue());
|
||||
}
|
||||
orderInfo.setPaidTime(LocalDateTime.now());
|
||||
|
|
|
|||
Loading…
Reference in New Issue