打印样式修改

This commit is contained in:
Tankaikai
2024-10-15 16:31:18 +08:00
parent cb1d05a042
commit e5da3ebb30
7 changed files with 159 additions and 5 deletions

View File

@@ -135,6 +135,7 @@ public class PrintConsumer {
private List<TbPrintMachine> getPrintMachine(Integer shopId, String subType, String printMethod, String printType) {
TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(shopId);
if (ObjectUtil.isEmpty(shopInfo)) {
log.error("店铺信息不存在");

View File

@@ -81,7 +81,7 @@ public class FeiPrinter extends PrinterHandler {
orderInfo.getOrderNo(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())),
"【POS-1】001", orderInfo.getOrderAmount().toPlainString(), balance,
(ObjectUtil.isEmpty(orderInfo.getPayType()) || ObjectUtil.isNull(orderInfo.getPayType()) ? "" : orderInfo.getPayType()),
"0", detailList, orderInfo.getRemark(), null, null);
"0", detailList, orderInfo.getRemark(), orderInfo.getDiscountAmount()==null?null:orderInfo.getDiscountAmount().toPlainString(), orderInfo.getDiscountRatio()==null?null:orderInfo.getDiscountRatio().toPlainString());
String printType = "结算单";
String[] resp = FeieyunPrintUtil.getCashPrintData(detailPO, machine.getAddress(), printType, printType);
shopPrintLogService.save(machine, "结算单", resp[0], resp[1]);