diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java index 45d72dd..2f50745 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java @@ -128,9 +128,6 @@ public class FeieyunPrintUtil { builder.append("" + productName + " x " + number + "

"); builder.append("" + remark + "
"); } - - - builder.append("





"); builder.append(""); return builder.toString(); } @@ -236,9 +233,9 @@ public class FeieyunPrintUtil { String t = "¥" + (ObjectUtil.isEmpty(detailPO.getDiscountAmount()) || ObjectUtil.isNull(detailPO.getDiscountAmount()) ? detailPO.getReceiptsAmount() : new BigDecimal(detailPO.getReceiptsAmount()).subtract(new BigDecimal(detailPO.getDiscountAmount())).toPlainString()); t = String.format("%11s", t).replace(' ', ' '); if (orderType.equals("return")) { - data.append(StrUtil.format("应退:{}
", t)); + data.append(StrUtil.format("应退:{}
", t)); } else { - data.append(StrUtil.format("应收:{}
", t)); + data.append(StrUtil.format("应收:{}
", t)); } if (ObjectUtil.isNotEmpty(detailPO.getPayType()) && ObjectUtil.isNotNull(detailPO.getPayType()) && detailPO.getPayType().equals("deposit")) { data.append("--------------------------------
");