From b854c9bc0f5c5fc8f2693d0fca9ec9d70c04a055 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 16 Apr 2026 18:14:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E7=8F=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/mq/PrintMqListener.java          | 2 +-
 .../account/service/impl/HandoverRecordServiceImpl.java    | 1 +
 .../main/java/com/czg/service/order/print/PrinterImpl.java | 7 ++++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java b/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java
index f73bb4c85..559078a2a 100644
--- a/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java
+++ b/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java
@@ -85,7 +85,7 @@ public class PrintMqListener {
         String printTypeEnum = jsonObject.getString("printTypeEnum");
         JSONObject data2 = jsonObject.getJSONObject("data");
         PrinterHandler.PrintTypeEnum typeEnum = PrinterHandler.PrintTypeEnum.valueOf(printTypeEnum);
-        if (typeEnum == PrinterHandler.PrintTypeEnum.HANDOVER) {
+        if (typeEnum != PrinterHandler.PrintTypeEnum.HANDOVER) {
             SysPrintData sysPrintData = new SysPrintData();
             sysPrintData.setShopId(shopId);
             sysPrintData.setData(data2.toJSONString());
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java
index 11e965605..43771b2af 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/HandoverRecordServiceImpl.java
@@ -99,6 +99,7 @@ public class HandoverRecordServiceImpl extends ServiceImpl<HandoverRecordMapper,
         if (handoverRecord != null) {
             data.setTurnover(NumberUtil.add(data.getTurnover(), handoverRecord.getRecharge()));
             data.setRefundAmount(NumberUtil.add(data.getRefundAmount(), handoverRecord.getRefundAmount()));
+            data.setRecharge(handoverRecord.getRecharge());
         }
         data.setReturnDishCount(orderInfoRpcService.countReturnDish(shopId, loginTimeStr, handoverTimeStr));
         return data;
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 85a89de56..973f3e041 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
@@ -164,12 +164,13 @@ public interface PrinterImpl {
                 .append(getFormatLabel(leftRightAlign(" 退款金额:", bigDecimalToString(handoverRecord.getRefundAmount()), 32), signLabelInfo.s)).append(signLabelInfo.br)
                 .append(getFormatLabel(leftRightAlign(" 退菜数量:", bigDecimalToString(handoverRecord.getReturnDishCount()), 32), signLabelInfo.s)).append(signLabelInfo.br)
                 .append(getDividingLine()).append(signLabelInfo.br)
-                .append(getFormatLabel(leftRightAlign("订单数量/订单总额", handoverRecord.getOrderCount() + "/" + handoverRecord.getOrderTurnover(), 32), signLabelInfo.s)).append(signLabelInfo.br)
-                .append(getFormatLabel("----------- 销售数据 -----------", signLabelInfo.s)).append(signLabelInfo.br)
-                .append(getFormatLabel(key3("商品分类", "数量", "总计", 14, 8), signLabelInfo.s))
+                .append(getFormatLabel(leftRightAlign("订单数量/订单总额", handoverRecord.getOrderCount() + "/" + bigDecimalToString(handoverRecord.getOrderTurnover()), 32), signLabelInfo.s))
                 .append(signLabelInfo.br);
 
         if (StrUtil.isNotBlank(handoverRecord.getCategoryData())) {
+            builder.append(getFormatLabel("----------- 销售数据 -----------", signLabelInfo.s)).append(signLabelInfo.br)
+                    .append(getFormatLabel(key3("商品分类", "数量", "总计", 14, 8), signLabelInfo.s))
+                    .append(signLabelInfo.br);
             JSONArray.parseArray(handoverRecord.getCategoryData()).forEach(item -> {
                 JSONObject info = (JSONObject) item;
                 String categoryName = info.getString("categoryName");