修改计算优惠金额5
This commit is contained in:
@@ -105,7 +105,7 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl {
|
|||||||
|
|
||||||
if (orderInfo.getPayAmount() != null && orderInfo.getPayAmount().compareTo(BigDecimal.ZERO) == 0) {
|
if (orderInfo.getPayAmount() != null && orderInfo.getPayAmount().compareTo(BigDecimal.ZERO) == 0) {
|
||||||
// 设置支付金额为 订单原价-订单优惠金额
|
// 设置支付金额为 订单原价-订单优惠金额
|
||||||
printInfoDTO.setPayAmount(orderInfo.getOriginAmount().subtract(orderInfo.getDiscountAllAmount()).toPlainString());
|
printInfoDTO.setPayAmount((new BigDecimal(printInfoDTO.getOriginalAmount()).subtract(new BigDecimal(printInfoDTO.getDiscountAmount()))).toPlainString());
|
||||||
}
|
}
|
||||||
String string = buildOrderPrintData(printInfoDTO, detailList);
|
String string = buildOrderPrintData(printInfoDTO, detailList);
|
||||||
String o = sendPrintRequest(machine.getAddress(), string, null, printerNum);
|
String o = sendPrintRequest(machine.getAddress(), string, null, printerNum);
|
||||||
|
|||||||
@@ -172,7 +172,7 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
|
|||||||
: "0.00");
|
: "0.00");
|
||||||
if (isPre) {
|
if (isPre) {
|
||||||
// 设置支付金额为 订单原价-订单优惠金额
|
// 设置支付金额为 订单原价-订单优惠金额
|
||||||
printInfoDTO.setPayAmount(orderInfo.getOriginAmount().subtract(orderInfo.getDiscountAllAmount()).toPlainString());
|
printInfoDTO.setPayAmount((new BigDecimal(printInfoDTO.getOriginalAmount()).subtract(new BigDecimal(printInfoDTO.getDiscountAmount()))).toPlainString());
|
||||||
}
|
}
|
||||||
printInfoDTO.setPrintTitle(printInfoDTO.getPrintTitle());
|
printInfoDTO.setPrintTitle(printInfoDTO.getPrintTitle());
|
||||||
if (orderInfo.getSeatNum() != null && orderInfo.getSeatAmount().compareTo(BigDecimal.ZERO) > 0) {
|
if (orderInfo.getSeatNum() != null && orderInfo.getSeatAmount().compareTo(BigDecimal.ZERO) > 0) {
|
||||||
|
|||||||
Reference in New Issue
Block a user