From c09e600857db0fbbb1e1e38d3e9e55650826c1f5 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 3 Apr 2026 15:33:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A4=90=E4=BD=8D=E8=B4=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/service/order/print/PrinterHandler.java | 17 +++++++++--------
 .../czg/service/order/print/PrinterImpl.java    |  5 ++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java
index e2b403b90..6379a7afb 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java
@@ -761,15 +761,20 @@ public abstract class PrinterHandler {
                         ? orderInfo.getDiscountAllAmount().toPlainString()
                         : "0.00");
 
-        if(StrUtil.isNotBlank(orderInfo.getDineMode())){
-            switch (orderInfo.getDineMode()){
+        printInfoDTO.setSeatNum(orderInfo.getSeatNum() == null ? "" : orderInfo.getSeatNum().toString());
+        if (orderInfo.getSeatNum() != null && orderInfo.getSeatAmount().compareTo(BigDecimal.ZERO) > 0) {
+            printInfoDTO.setSeatAmount(orderInfo.getSeatAmount().divide(BigDecimal.valueOf(orderInfo.getSeatNum()), 2, RoundingMode.DOWN).toPlainString());
+        }
+        if (StrUtil.isNotBlank(orderInfo.getDineMode())) {
+            switch (orderInfo.getDineMode()) {
                 case "dine-in" -> printInfoDTO.setPrintType("收银-堂食");
                 case "take-out" -> printInfoDTO.setPrintType("收银-外带");
                 case "take-away" -> printInfoDTO.setPrintType("收银-外卖");
             }
+            if ("dine-in".equals(orderInfo.getDineMode())) {
+                orderInfo.setSeatAmount(BigDecimal.ZERO);
+            }
         }
-
-
         if (orderInfo.getStaffId() != null) {
             ShopStaff detail = shopStaffService.getOne(new QueryWrapper().eq(ShopStaff::getId, orderInfo.getStaffId()).eq(ShopStaff::getShopId, orderInfo.getShopId()));
             if (detail != null) {
@@ -780,10 +785,6 @@ public abstract class PrinterHandler {
         } else {
             printInfoDTO.setOperator("");
         }
-        printInfoDTO.setSeatNum(orderInfo.getSeatNum() == null ? "" : orderInfo.getSeatNum().toString());
-        if (orderInfo.getSeatNum() != null && orderInfo.getSeatAmount().compareTo(BigDecimal.ZERO) > 0) {
-            printInfoDTO.setSeatAmount(orderInfo.getSeatAmount().divide(BigDecimal.valueOf(orderInfo.getSeatNum()), 2, RoundingMode.DOWN).toPlainString());
-        }
         if ("结算单".equals(printTitle)) {
             if (StrUtil.isNotBlank(orderInfo.getPayType())) {
                 switch (orderInfo.getPayType()) {
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
index 8bdb32efb..2126dde94 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
@@ -184,7 +184,7 @@ public interface PrinterImpl {
                 .append(getFormatLabel("交班小票", signLabelInfo.s, signLabelInfo.center)).append(signLabelInfo.br)
                 .append(getFormatLabel("交班时间: " + DateUtil.format(handoverRecord.getHandoverTime(), "yyyy/MM/dd HH:mm:ss"), signLabelInfo.s)).append(signLabelInfo.br)
                 .append(getFormatLabel("收银员: " + handoverRecord.getStaffName(), signLabelInfo.s)).append(signLabelInfo.br)
-                .append(getFormatLabel("周期:" + DateUtil.format(handoverRecord.getLoginTime(), "MM/dd HH:mm") + "-" +
+                .append(getFormatLabel("周期: " + DateUtil.format(handoverRecord.getLoginTime(), "MM/dd HH:mm") + " - " +
                         DateUtil.format(handoverRecord.getHandoverTime(), "MM/dd HH:mm"), signLabelInfo.s)).append(signLabelInfo.br)
 
                 .append(signLabelInfo.br)
@@ -222,8 +222,7 @@ public interface PrinterImpl {
         builder
                 .append(getFormatLabel("打印时间: " + DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"), signLabelInfo.s)).append(signLabelInfo.br)
                 .append(signLabelInfo.getOut(180))
-                .append(signLabelInfo.cut)
-        ;
+                .append(signLabelInfo.cut);
         return builder.toString();
     }