优化订单小票打印

2026-04-08 15:06:22 +08:00
parent 8655757dd6
commit 1985713f28
19 changed files with 782 additions and 395 deletions
--- a/dist-electron/main.js
+++ b/dist-electron/main.js
--- a/electron/main.js
+++ b/electron/main.js
@@ -5,7 +5,7 @@ import axios from "axios";
 import os from "os";
 import fs from "fs";
 import { exec } from "child_process";
-import { printReceipt, printHandoverReceipt, printRefund } from "./printService";
+import { printReceipt, printHandoverReceipt, printRefund,printRefundDish } from "./printService";

 // ===== 核心配置：单文件缓存 =====
 // 固定的缓存文件路径（永远只存这1个文件）
@@ -134,7 +134,7 @@ app.whenReady().then(() => {
    }
  });

-  // 打印退菜单/退款小票
+  // 打印退款小票
  ipcMain.on('printRefund', async (event, arg) => {
    try {
      let _parmas = JSON.parse(arg);
@@ -147,6 +147,19 @@ app.whenReady().then(() => {
    }
  });

+  // 打印退菜单
+  ipcMain.on('printRefundDish', async (event, arg) => {
+    try {
+      let _parmas = JSON.parse(arg);
+      // console.log(_parmas);
+      await printRefundDish(_parmas.printerIp, _parmas.orderData);
+      return { ok: true }
+    } catch (e) {
+      console.log(e);
+      return { ok: false, msg: e.message }
+    }
+  });
+
  app.on("activate", () => {
    // 在 macOS 系统内, 如果没有已开启的应用窗口
    // 点击托盘图标时通常会重新创建一个新窗口
--- a/electron/printService.js
+++ b/electron/printService.js
@@ -82,8 +82,27 @@ const dineModeFilter = t => {
    return t
 }

+// 支付类型 主扫 main_scan
+// 被扫 back_scan
+// 微信小程序 wechat_mini
+// 支付宝小程序 alipay_mini
+// 会员支付 vip_pay
+// 现金支付 cash_pay
+// 挂账支付 credit_pay
+const payTypeFilter = t => {
+    if (t === 'main_scan') return '主扫'
+    if (t === 'back_scan') return '被扫'
+    if (t === 'wechat_mini') return '微信小程序'
+    if (t === 'alipay_mini') return '支付宝小程序'
+    if (t === 'vip_pay') return '余额支付'
+    if (t === 'cash_pay') return '现金支付'
+    if (t === 'credit_pay') return '挂账支付'
+    return t
+}
+
 // ======================== 打印结算小票 ========================
 export function printReceipt(printerIp, order) {
+    // console.log('Printing receipt...', JSON.stringify(order));
    return new Promise((resolve) => {
        const socket = new net.Socket()
        const lineWidth = 48
@@ -98,10 +117,10 @@ export function printReceipt(printerIp, order) {
                // ======================== 标题区域（彻底修复居中问题！） ========================
                const title1 = order.shop_name || '';
                let title2 = `结算单 #${order.orderInfo.orderNum}`
-                if (order.isBefore && !order.isGuest) {
+                if (order.isBefore) {
                    title2 = `${order.isBefore ? '预' : ''}结算单 #${order.orderInfo.orderNum}`;
                }
-                if (order.isGuest && order.isBefore) {
+                if (order.isGuest) {
                    title2 = `客看单 #${order.orderInfo.orderNum}`;
                }

@@ -145,8 +164,8 @@ export function printReceipt(printerIp, order) {
                const rightPart = padRightAlign(`${seatNumText}人`, 28) // 加标签更清晰，也可只显示数字

                orderInfo += leftPart + rightPart + '\n'
-                if (!order.isBefore) {
-                    orderInfo += padLeftAlign('结账时间：', 10) + padLeftAlign(order.createdAt || '-', 38) + '\n'
+                if (!order.isBefore && !order.isGuest) {
+                    orderInfo += padLeftAlign('结账时间：', 10) + padLeftAlign(order.orderInfo.paidTime || '-', 38) + '\n'
                }
                orderInfo += createDivider(lineWidth, 'thin') + '\n'

@@ -157,15 +176,54 @@ export function printReceipt(printerIp, order) {
                orderInfo += padRightAlign('小计', 16) + '\n'
                orderInfo += createDivider(lineWidth, 'thin') + '\n'

+                // 处理商品列表（套餐主项显示金额，子项不显示金额 + 规格换行）
                order.carts.forEach(item => {
-                    const name = truncateByPrintWidth(item.name || '未知商品', 18)
-                    const price = formatAmount(item.salePrice)
-                    const num = item.number || 1
-                    const total = formatAmount(item.totalAmount)
-                    orderInfo += padLeftAlign(name, 18)
-                    orderInfo += padLeftAlign(price, 8)
-                    orderInfo += padLeftAlign(num, 6)
-                    orderInfo += padRightAlign(total, 16) + '\n'
+                    if (item.number > 0) {
+                        // 套餐商品逻辑
+                        if (item.proGroupInfo) {
+                            // 套餐主项：正常显示 名称、单价、数量、小计
+                            const packageName = truncateByPrintWidth(item.name || '未知套餐', 18)
+                            orderInfo += padLeftAlign(packageName, 18)
+                            orderInfo += padLeftAlign(formatAmount(item.salePrice), 8)
+                            orderInfo += padLeftAlign(item.number || 1, 6)
+                            orderInfo += padRightAlign(formatAmount(item.totalAmount), 16) + '\n'
+
+                            // 套餐子项：只显示名称+规格，单价、小计全部为空
+                            const proGroupInfo = item.proGroupInfo || []
+                            proGroupInfo.forEach(subItem => {
+                                const subName = truncateByPrintWidth(`>${subItem.proName || '未知商品'}`, 18)
+                                orderInfo += padLeftAlign(subName, 18)
+                                orderInfo += padLeftAlign('', 8) // 子项单价空
+                                orderInfo += padLeftAlign(subItem.number || 1, 6)
+                                orderInfo += padRightAlign('', 16) + '\n' // 子项小计空
+
+                                // 子项规格换行显示
+                                if (subItem.skuName) {
+                                    const skuText = truncateByPrintWidth(`  规格：${subItem.skuName}`, 18)
+                                    orderInfo += padLeftAlign(skuText, 18)
+                                    orderInfo += padLeftAlign('', 8)
+                                    orderInfo += padLeftAlign('', 6)
+                                    orderInfo += padRightAlign('', 16) + '\n'
+                                }
+                            })
+                        } else {
+                            // 普通商品：正常显示 + 规格换行
+                            let productName = truncateByPrintWidth(item.name || '未知商品', 18)
+                            orderInfo += padLeftAlign(productName, 18)
+                            orderInfo += padLeftAlign(item.salePrice ? formatAmount(item.salePrice) : '', 8)
+                            orderInfo += padLeftAlign(item.number || 1, 6)
+                            orderInfo += padRightAlign(formatAmount(item.totalAmount), 16) + '\n'
+
+                            // 规格单独换行
+                            if (item.skuName) {
+                                const skuLine = truncateByPrintWidth(`  规格：${item.skuName}`, 18)
+                                orderInfo += padLeftAlign(skuLine, 18)
+                                orderInfo += padLeftAlign('', 8)
+                                orderInfo += padLeftAlign('', 6)
+                                orderInfo += padRightAlign('', 16) + '\n'
+                            }
+                        }
+                    }
                })

                orderInfo += createDivider(lineWidth, 'thin') + '\n'
@@ -176,14 +234,24 @@ export function printReceipt(printerIp, order) {
                socket.write(iconv.encode(orderInfo, 'gbk'))

                // ======================== 付款信息 ========================
-                const payableLine = padLeftAlign('应付', 10) + padRightAlign(formatAmount(order.originAmount), 51) + '\n'
-                socket.write(Buffer.from([0x1B, 0x21, 0x11])); // 放大字号
-                socket.write(Buffer.from([0x1B, 0x45, 0x01])); // 加粗
-                socket.write(iconv.encode(payableLine, 'gbk'));
-                socket.write(Buffer.from([0x1B, 0x21, 0x00])); // 恢复默认字号
-                socket.write(Buffer.from([0x1B, 0x45, 0x00])); // 取消加粗
-                socket.write(iconv.encode(createDivider(lineWidth, 'thin') + '\n', 'gbk'));
-                if (!order.isBefore) {
+                if (order.isBefore) {
+                    const payableLine = padLeftAlign('应付', 10) + padRightAlign(formatAmount(order.originAmount), 51) + '\n'
+                    socket.write(Buffer.from([0x1B, 0x21, 0x11])); // 放大字号
+                    socket.write(Buffer.from([0x1B, 0x45, 0x01])); // 加粗
+                    socket.write(iconv.encode(payableLine, 'gbk'));
+                    socket.write(Buffer.from([0x1B, 0x21, 0x00])); // 恢复默认字号
+                    socket.write(Buffer.from([0x1B, 0x45, 0x00])); // 取消加粗
+                    socket.write(iconv.encode(createDivider(lineWidth, 'thin') + '\n', 'gbk'));
+                }
+
+                if (!order.isBefore && !order.isGuest) {
+                    const payableLine = padLeftAlign('应付', 10) + padRightAlign(formatAmount(order.orderInfo.payAmount), 51) + '\n'
+                    socket.write(Buffer.from([0x1B, 0x21, 0x11])); // 放大字号
+                    socket.write(Buffer.from([0x1B, 0x45, 0x01])); // 加粗
+                    socket.write(iconv.encode(payableLine, 'gbk'));
+                    socket.write(Buffer.from([0x1B, 0x21, 0x00])); // 恢复默认字号
+                    socket.write(Buffer.from([0x1B, 0x45, 0x00])); // 取消加粗
+                    socket.write(iconv.encode(createDivider(lineWidth, 'thin') + '\n', 'gbk'));
                    const paidLine = padLeftAlign('已付', 10) + padRightAlign(formatAmount(order.orderInfo.payAmount), 51) + '\n'
                    socket.write(Buffer.from([0x1B, 0x21, 0x11]));
                    socket.write(Buffer.from([0x1B, 0x45, 0x01]));
@@ -195,6 +263,9 @@ export function printReceipt(printerIp, order) {

                // ======================== 底部 ========================
                let bottom = ''
+                if (!order.isBefore && !order.isGuest) {
+                    bottom += padLeftAlign('支付方式：', 8) + padLeftAlign(payTypeFilter(order.orderInfo.payType) || '无', 38) + '\n'
+                }
                bottom += padLeftAlign('操作员：', 8) + padLeftAlign(order.loginAccount || '无', 38) + '\n'
                bottom += padLeftAlign('打印时间：', 10) + padLeftAlign(new Date().toLocaleString(), 38) + '\n'
                bottom += padLeftAlign('订单号：', 8) + padLeftAlign(order.orderInfo.orderNo || '-', 38) + '\n'
@@ -222,8 +293,7 @@ export function printReceipt(printerIp, order) {
    })
 }

-
-// ======================== 打印退菜单/退款小票 ========================
+// ======================== 退款小票 ========================
 export function printRefund(printerIp, order) {
    console.log(JSON.stringify(order));

@@ -240,7 +310,7 @@ export function printRefund(printerIp, order) {

                // ======================== 标题区域（彻底修复居中问题！） ========================
                const title1 = order.shop_name || '';
-                let title2 = order.title || '退款单'
+                let title2 = '退款单';

                // 核心修复：先写入空行清空打印机缓冲区，避免残留字符干扰居中起始位置
                socket.write(iconv.encode('\n', 'gbk'));
@@ -308,6 +378,7 @@ export function printRefund(printerIp, order) {
                }

                // ======================== 付款信息 ========================
+
                let payableLine = ''
                payableLine += padLeftAlign('退款总计', 10) + padRightAlign(formatAmount(order.amount), 51) + '\n'
                socket.write(Buffer.from([0x1B, 0x21, 0x11])); // 放大字号
@@ -315,6 +386,7 @@ export function printRefund(printerIp, order) {
                socket.write(iconv.encode(payableLine, 'gbk'));
                socket.write(Buffer.from([0x1B, 0x21, 0x00])); // 恢复默认字号
                socket.write(Buffer.from([0x1B, 0x45, 0x00])); // 取消加粗
+
                let refundInfo = ''
                refundInfo += padLeftAlign('退款方式：', 10) + padLeftAlign(order.refundMethod || '无', 38) + '\n'
                refundInfo += padLeftAlign('退款原因：', 10) + padLeftAlign(order.remark || '无', 38) + '\n'
@@ -350,6 +422,135 @@ export function printRefund(printerIp, order) {
    })
 }

+// ======================== 打印退菜单 ========================
+export function printRefundDish(printerIp, order) {
+    console.log(JSON.stringify(order));
+
+    return new Promise((resolve) => {
+        const socket = new net.Socket()
+        const lineWidth = 48
+        socket.setTimeout(8000)
+
+        const formatAmount = (amount) => Number(amount || 0).toFixed(2)
+
+        socket.connect(9100, printerIp, () => {
+            try {
+                setupPrinter(socket)
+
+                // ======================== 标题区域（彻底修复居中问题！） ========================
+                const title1 = order.shop_name || '';
+                let title2 = '退菜单'
+
+                // 核心修复：先写入空行清空打印机缓冲区，避免残留字符干扰居中起始位置
+                socket.write(iconv.encode('\n', 'gbk'));
+
+                // 步骤1：重置打印机格式（避免残留格式影响）
+                socket.write(Buffer.from([0x1B, 0x40]));
+                // 步骤2：居中对齐标题
+                socket.write(Buffer.from([0x1B, 0x61, 0x01])); // 1 = center
+                // 步骤3：设置标题1的格式（加粗+大号字体）
+                socket.write(Buffer.from([0x1B, 0x21, 0x11])); // 字号放大（0x11 是常用放大值）
+                socket.write(Buffer.from([0x1B, 0x45, 0x01])); // 加粗
+                socket.write(iconv.encode(title1 + '\n', 'gbk'));
+
+                // 步骤4：恢复格式，打印标题2（常规字体）
+                socket.write(Buffer.from([0x1B, 0x21, 0x00])); // 恢复默认字号
+                socket.write(Buffer.from([0x1B, 0x45, 0x00])); // 取消加粗
+                socket.write(iconv.encode(title2 + '\n\n', 'gbk'));
+                socket.write(Buffer.from([0x1B, 0x61, 0x00])); // 0 = left
+
+                // ======================== 订单信息（修复显示+换行问题） ========================
+                const tableLine = padLeftAlign('桌台号：', 8) + padLeftAlign(order.orderInfo.tableName || '无', 14) + '\n'
+                socket.write(Buffer.from([0x1B, 0x21, 0x00])); // 正常字号
+                socket.write(Buffer.from([0x1B, 0x45, 0x01])); // 加粗
+                socket.write(iconv.encode(tableLine, 'gbk'));
+                socket.write(Buffer.from([0x1B, 0x45, 0x00])); // 取消加粗
+
+                let orderInfo = ''
+
+                // 修复：打印机-用餐模式 + 就餐人数 展示逻辑
+                const dineModeText = dineModeFilter(order.orderInfo.dineMode)
+                // 1. 拼接打印机+用餐模式文本，空值兜底
+                const printerDineText = `${order.printerName || '未知打印机'}-${dineModeText || '未知模式'}`
+                // 2. 截断超长文本（左侧分配20宽度，保证不超限）
+                const truncatedPrinterDine = truncateByPrintWidth(printerDineText, 20)
+                // 3. 左侧左对齐填充20宽度（保证占满分配空间，不浪费空白）
+                const leftPart = padLeftAlign(truncatedPrinterDine, 20)
+                // 4. 右侧就餐人数：空值兜底为“无”，右对齐填充28宽度（20+28=48，刚好行宽）
+                const seatNumText = order.orderInfo.seatNum || '0'
+                const rightPart = padRightAlign(`${seatNumText}人`, 28) // 加标签更清晰，也可只显示数字
+
+                if (order.carts.length > 0) {
+                    orderInfo += leftPart + rightPart + '\n'
+                    orderInfo += createDivider(lineWidth, 'thin') + '\n'
+
+                    // ======================== 商品表格 ========================
+                    orderInfo += padLeftAlign('品名', 18)
+                    orderInfo += padLeftAlign('单价', 8)
+                    orderInfo += padLeftAlign('数量', 6)
+                    orderInfo += padRightAlign('小计', 16) + '\n'
+                    orderInfo += createDivider(lineWidth, 'thin') + '\n'
+
+                    order.carts.forEach(item => {
+                        const name = truncateByPrintWidth(item.name || '未知商品', 18)
+                        const price = formatAmount(item.salePrice)
+                        const num = item.number || 1
+                        const total = formatAmount(item.totalAmount)
+                        orderInfo += padLeftAlign(name, 18)
+                        orderInfo += padLeftAlign(price, 8)
+                        orderInfo += padLeftAlign(num, 6)
+                        orderInfo += padRightAlign(total, 16) + '\n'
+                    })
+
+                    orderInfo += createDivider(lineWidth, 'thin') + '\n'
+                    socket.write(iconv.encode(orderInfo, 'gbk'))
+                }
+
+                // ======================== 付款信息 ========================
+                // if (order.isGuest) {
+                //     let payableLine = ''
+                //     payableLine += padLeftAlign('退款总计', 10) + padRightAlign(formatAmount(order.amount), 51) + '\n'
+                //     socket.write(Buffer.from([0x1B, 0x21, 0x11])); // 放大字号
+                //     socket.write(Buffer.from([0x1B, 0x45, 0x01])); // 加粗
+                //     socket.write(iconv.encode(payableLine, 'gbk'));
+                //     socket.write(Buffer.from([0x1B, 0x21, 0x00])); // 恢复默认字号
+                //     socket.write(Buffer.from([0x1B, 0x45, 0x00])); // 取消加粗
+                // }
+                // let refundInfo = ''
+                // refundInfo += padLeftAlign('退款方式：', 10) + padLeftAlign(order.refundMethod || '无', 38) + '\n'
+                // refundInfo += padLeftAlign('退款原因：', 10) + padLeftAlign(order.remark || '无', 38) + '\n'
+                // socket.write(iconv.encode(refundInfo, 'gbk'));
+                // socket.write(iconv.encode(createDivider(lineWidth, 'thin') + '\n', 'gbk'));
+
+                // ======================== 底部 ========================
+                let bottom = ''
+                bottom += padLeftAlign('操作员：', 8) + padLeftAlign(order.loginAccount || '无', 38) + '\n'
+                bottom += padLeftAlign('打印时间：', 10) + padLeftAlign(new Date().toLocaleString(), 38) + '\n'
+                bottom += padLeftAlign('原订单号：', 10) + padLeftAlign(order.orderInfo.orderNo || '-', 38) + '\n'
+                bottom += createDivider(lineWidth, 'full') + '\n'
+                bottom += '\n\n'
+                bottom += '\n\n'
+
+                socket.write(iconv.encode(bottom, 'gbk'))
+                socket.write(Buffer.from([0x1D, 0x56, 0x00]))
+
+                setTimeout(() => {
+                    socket.end()
+                    resolve('success')
+                }, 400)
+            } catch (err) {
+                console.error(err)
+                socket.destroy()
+                resolve('error')
+            }
+        })
+
+        socket.on('error', () => resolve('error'))
+        socket.on('timeout', () => resolve('timeout'))
+        socket.on('close', () => { })
+    })
+}
+
 // ======================== 打印交班小票（完整版 · 补齐分类/商品数据） ========================
 export function printHandoverReceipt(printerIp, data) {
    return new Promise((resolve) => {
@@ -390,22 +591,23 @@ export function printHandoverReceipt(printerIp, data) {
                let basicInfo = ''
                // 优化：拆分当班时间和交班时间，空值兜底
                basicInfo += padLeftAlign('交班时间：', 10) + padLeftAlign(data.handoverTime || '-', 36) + '\n'
-                basicInfo += padLeftAlign('收银员：', 8) + padLeftAlign(data.staffName || '-', 36) + '\n'
-                basicInfo += padLeftAlign('交班周期：', 10) + padLeftAlign(`${data.loginTime}-${data.handoverTime}` || '-', 36) + '\n\n'
+                basicInfo += padLeftAlign('交班人：', 8) + padLeftAlign(data.staffName || '-', 36) + '\n'
+                basicInfo += padLeftAlign('交班：', 6) + padLeftAlign(`${data.loginTime} - ${data.handoverTime}` || '-', 36) + '\n\n'

                // basicInfo += createDivider(lineWidth, 'thin') + '\n'

                // 收入明细 - 补充会员支付/充值字段
-                basicInfo += padLeftAlign('当班营业总额：', 10) + padLeftAlign(formatAmount(data.handAmount), 36) + '\n'
+                basicInfo += padLeftAlign('当班营业总额：', 10) + padLeftAlign(formatAmount(data.turnover), 36) + '\n'
                basicInfo += padLeftAlign('实际收款的支付方式', 10) + '\n'
-                basicInfo += padLeftAlign('现金', 10) + padRightAlign(formatAmount(data.cashAmount), 36) + '\n'
-                basicInfo += padLeftAlign('微信', 10) + padRightAlign(formatAmount(data.wechatAmount), 36) + '\n'
-                basicInfo += padLeftAlign('支付宝', 10) + padRightAlign(formatAmount(data.alipayAmount), 36) + '\n'
-                basicInfo += padLeftAlign('二维码收款', 10) + padRightAlign(formatAmount(data.vipPay), 36) + '\n'
-                basicInfo += padLeftAlign('扫码收款', 10) + padRightAlign(formatAmount(data.vipRecharge), 36) + '\n\n'
+                basicInfo += padLeftAlign('现金', 10) + padRightAlign(formatAmount(data.cash), 36) + '\n'
+                basicInfo += padLeftAlign('微信', 10) + padRightAlign(formatAmount(data.wechat), 36) + '\n'
+                basicInfo += padLeftAlign('支付宝', 10) + padRightAlign(formatAmount(data.alipay), 36) + '\n'
+                basicInfo += padLeftAlign('二维码收款', 10) + padRightAlign(formatAmount(data.selfScan), 36) + '\n'
+                basicInfo += padLeftAlign('扫码收款', 10) + padRightAlign(formatAmount(data.barScan), 36) + '\n'
+                basicInfo += padLeftAlign('充值', 10) + padRightAlign(formatAmount(data.recharge), 36) + '\n\n'
                basicInfo += padLeftAlign('非实际收款的支付方式', 10) + '\n'
-                basicInfo += padLeftAlign('挂账', 10) + padRightAlign(formatAmount(data.creditAmount), 36) + '\n'
-                basicInfo += padLeftAlign('余额', 10) + padRightAlign(formatAmount(data.vipPay), 36) + '\n'
+                basicInfo += padLeftAlign('挂账', 10) + padRightAlign(formatAmount(data.owed), 36) + '\n'
+                basicInfo += padLeftAlign('余额', 10) + padRightAlign(formatAmount(data.balance), 36) + '\n'
                basicInfo += createDivider(lineWidth, 'thin') + '\n'

                socket.write(Buffer.from([0x1B, 0x21, 0x00])); // 正常字号
@@ -414,27 +616,27 @@ export function printHandoverReceipt(printerIp, data) {
                let refundInfo = ''
                refundInfo += padLeftAlign('退款/退菜', 10) + '\n'
                refundInfo += padLeftAlign('退款金额', 10) + padRightAlign(formatAmount(data.refundAmount), 36) + '\n'
-                refundInfo += padLeftAlign('退菜数量', 10) + padRightAlign(formatAmount(data.refundAmount), 36) + '\n'
+                refundInfo += padLeftAlign('退菜数量', 10) + padRightAlign(formatAmount(data.returnDishCount), 36) + '\n'
                refundInfo += createDivider(lineWidth, 'thin') + '\n'
                socket.write(iconv.encode(refundInfo, 'gbk'))

                let orderInfo = ''
                const orderLabel = '订单（数量/订单总额）'
-                const orderValue = `${data.orderCount}/${formatAmount(data.orderAmount)}`
+                const orderValue = `${data.orderCount}/${formatAmount(data.orderTurnover)}`
                const orderLabelWidth = lineWidth - getPrintWidth(orderValue)
                orderInfo += padLeftAlign(orderLabel, orderLabelWidth) + orderValue + '\n\n'
                socket.write(iconv.encode(orderInfo, 'gbk'))

                // ======================== 分类数据区域 ========================
                let categoryInfo = ''
-                if (data.categoryDataList && data.categoryDataList.length) {
+                if (data.categoryList && data.categoryList.length) {
                    categoryInfo += centerAlign('销售数据', lineWidth) + '\n'
                    categoryInfo += createDivider(lineWidth, 'thin') + '\n'
                    // 分类表头
-                    categoryInfo += padLeftAlign('名称', 24) + padLeftAlign('数量', 12) + padRightAlign('总计', 12) + '\n'
+                    categoryInfo += padLeftAlign('商品分类', 24) + padLeftAlign('数量', 12) + padRightAlign('总计', 12) + '\n'
                    // categoryInfo += createDivider(lineWidth, 'thin') + '\n'
                    // 分类数据行
-                    data.categoryDataList.forEach(item => {
+                    data.categoryList.forEach(item => {
                        const catName = truncateByPrintWidth(item.categoryName || '未知分类', 24)
                        const num = item.num || 0
                        const amount = formatAmount(item.amount)
@@ -445,54 +647,22 @@ export function printHandoverReceipt(printerIp, data) {
                socket.write(iconv.encode(categoryInfo, 'gbk'))

                // ======================== 商品数据区域 ========================
-                let productInfo = ''
-                if (data.printShop && data.productDataList && data.productDataList.length) {
-                    productInfo += centerAlign('商品数据', lineWidth) + '\n'
-                    productInfo += createDivider(lineWidth, 'thin') + '\n'
-                    // 商品表头
-                    productInfo += padLeftAlign('商品', 36) + padRightAlign('数量', 12) + '\n'
-                    // productInfo += createDivider(lineWidth, 'thin') + '\n'
-                    // 商品数据行
-                    data.productDataList.forEach(item => {
-                        const prodName = truncateByPrintWidth(item.productName || '未知商品', 36)
-                        const num = item.num || 0
-                        productInfo += padLeftAlign(prodName, 36) + padRightAlign(num, 12) + '\n'
-                    })
-                    productInfo += createDivider(lineWidth, 'thin') + '\n'
-                }
-                socket.write(iconv.encode(productInfo, 'gbk'))
-
-                // ======================== 收入明细区域（优化对齐和格式） ========================
-                // let incomeInfo = ''
-                // incomeInfo += centerAlign('【收支汇总】', lineWidth) + '\n'
-                // incomeInfo += createDivider(lineWidth, 'thin') + '\n'
-
-                // // 收支汇总项（补充挂账金额）
-                // const incomeItems = [
-                //     { label: '快捷收款金额：', val: data.quickInAmount },
-                //     { label: '退款金额：', val: data.refundAmount },
-                //     { label: '总收入：', val: data.handAmount },
-                //     { label: '挂账金额：', val: data.creditAmount },
-                //     { label: '总订单数：', val: data.orderCount || 0 }
-                // ]
-
-                // incomeItems.forEach((item, index) => {
-                //     const labelPart = padLeftAlign(item.label, 16)
-                //     let valPart = ''
-                //     // 总收入/总订单数加粗显示
-                //     if (index === 2 || index === 4) {
-                //         socket.write(Buffer.from([0x1B, 0x45, 0x01])); // 加粗
-                //         valPart = padRightAlign(index === 4 ? item.val : formatAmount(item.val), 32)
-                //         incomeInfo += labelPart + valPart + '\n'
-                //         socket.write(Buffer.from([0x1B, 0x45, 0x00])); // 取消加粗
-                //     } else {
-                //         valPart = padRightAlign(formatAmount(item.val), 32)
-                //         incomeInfo += labelPart + valPart + '\n'
-                //     }
-                // })
-
-                // incomeInfo += createDivider(lineWidth, 'full') + '\n'
-                // socket.write(iconv.encode(incomeInfo, 'gbk'))
+                // let productInfo = ''
+                // if (data.detailList && data.detailList.length) {
+                //     productInfo += centerAlign('商品数据', lineWidth) + '\n'
+                //     productInfo += createDivider(lineWidth, 'thin') + '\n'
+                //     // 商品表头
+                //     productInfo += padLeftAlign('商品', 36) + padRightAlign('数量', 12) + '\n'
+                //     // productInfo += createDivider(lineWidth, 'thin') + '\n'
+                //     // 商品数据行
+                //     data.detailList.forEach(item => {
+                //         const prodName = truncateByPrintWidth(item.productName || '未知商品', 36)
+                //         const num = item.num || 0
+                //         productInfo += padLeftAlign(prodName, 36) + padRightAlign(num, 12) + '\n'
+                //     })
+                //     productInfo += createDivider(lineWidth, 'thin') + '\n'
+                // }
+                // socket.write(iconv.encode(productInfo, 'gbk'))

                // ======================== 底部区域（统一结算小票风格） ========================
                let bottomInfo = ''
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "vite-electron",
-	"version": "2.0.15",
+	"version": "2.0.21",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "vite-electron",
-			"version": "2.0.15",
+			"version": "2.0.21",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@element-plus/icons-vue": "^2.3.1",
@@ -29,7 +29,7 @@
 				"vue": "^3.3.8",
 				"vue-router": "^4.2.5",
 				"win32-api": "^26.1.2",
-				"ysk-utils": "^1.0.84"
+				"ysk-utils": "^1.0.85"
 			},
 			"devDependencies": {
 				"@vitejs/plugin-vue": "^4.5.0",
@@ -6723,9 +6723,10 @@
 			}
 		},
 		"node_modules/ysk-utils": {
-			"version": "1.0.84",
-			"resolved": "https://registry.npmmirror.com/ysk-utils/-/ysk-utils-1.0.84.tgz",
-			"integrity": "sha512-UAMM1FfQGWJ4QPdI2EbGyJy4zv29yPXzi+Eyv/MDT0AFutdMnvbq0Q941BHn2egie2DOiw5mtDaj4yOWaSuUgA==",
+			"version": "1.0.85",
+			"resolved": "https://registry.npmmirror.com/ysk-utils/-/ysk-utils-1.0.85.tgz",
+			"integrity": "sha512-HkbV4Jidi3G6DAuGAN972tClUYtC2zVoxo4crrxexfn0rZa8HjXatUfEbawHOeEzyl6G1CdC+160I2bKfxEBlA==",
+			"license": "ISC",
 			"dependencies": {
 				"bignumber.js": "^9.3.1",
 				"loadsh": "^0.0.4",
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vite-electron",
 	"private": true,
-	"version": "2.0.21",
+	"version": "2.0.23",
 	"main": "dist-electron/main.js",
 	"scripts": {
 		"dev": "chcp 65001 && vite",
@@ -32,7 +32,7 @@
 		"vue": "^3.3.8",
 		"vue-router": "^4.2.5",
 		"win32-api": "^26.1.2",
-		"ysk-utils": "^1.0.84"
+		"ysk-utils": "^1.0.85"
 	},
 	"devDependencies": {
 		"@vitejs/plugin-vue": "^4.5.0",
@@ -80,4 +80,4 @@
 			"createStartMenuShortcut": true
 		}
 	}
-}
+}
--- a/src/api/account.js
+++ b/src/api/account.js
@@ -317,7 +317,7 @@ export function handoverNetworkPrint(id) {
 export function printerList(subType = "") {
  return request({
    method: "get",
-    url: "/account/admin/printer",
+    url: "/account/admin/printer/getPrintLocal",
    params: {
      name: "",
      subType: subType,
--- a/src/api/product_new.js
+++ b/src/api/product_new.js
@@ -104,3 +104,17 @@ export function shopStoragePut(data) {
  });
 }

+
+/**
+ * 查询存取酒记录
+ * @param {*} data
+ * @returns
+ */
+export function shopStorageRecord(params) {
+  return request({
+    method: "get",
+    url: "/product/admin/shopStorage/record",
+    params,
+  });
+}
+
--- a/src/components/lodop/receiptPrint.js
+++ b/src/components/lodop/receiptPrint.js
@@ -5,7 +5,7 @@ import { formatDecimal } from "@/utils/index.js";
 * 打印订单小票
 */
 export default (data) => {
-  // console.log("需要打印的订单数据===", data);
+  console.log("需要打印的订单数据===", data);
  // console.log("data.deviceName===", data.deviceName);
  let LODOP = getLodop();
  LODOP.PRINT_INIT("打印小票");
--- a/src/components/payCard/payCard.vue
+++ b/src/components/payCard/payCard.vue
@@ -486,7 +486,8 @@ function upadatePayData() {
        newCustomerDiscountId: goodsStore.newUserDiscount !== null ? goodsStore.newUserDiscount.id : goodsStore.newUserDiscount !== null ? goodsStore.newUserDiscount.id : '', // 新客立减Id
        newCustomerDiscountAmount: goodsStore.newUserDiscount !== null ? goodsStore.newUserDiscount.amount : 0, // 新客立减金额
        vipDiscountAmount: goodsStore.cartInfo.costSummary.vipDiscountAmount, // 超级会员折扣
-        remark: '', // 现金支付备注
+        remark: goodsStore.remark, // 现金支付备注
+        dineMode: goodsStore.allSelected ? store.shopInfo.eatModel.split(',')[1] : store.shopInfo.eatModel.split(',')[0], // 用餐方式
    }
 }

@@ -559,9 +560,9 @@ async function confirmOrder(t = 1) {
                    ElMessageBox.prompt('确定现金支付？', '注意', {
                        confirmButtonText: '确定',
                        cancelButtonText: '取消',
-                        inputPlaceholder: '请输入备注（选填）',
+                        inputPlaceholder: goodsStore.remark ? goodsStore.remark : '请输入备注（选填）',
                    }).then(async ({ value }) => {
-                        payData.value.checkOrderPay.remark = value;
+                        payData.value.checkOrderPay.remark = value ? value : goodsStore.remark;
                        if (props.selecttype == 0) {
                            payLoading.loading = true
                            await cashPay(payData.value);
--- a/src/store/goods.js
+++ b/src/store/goods.js
@@ -36,6 +36,7 @@ const initialCostSummary = {
 // 商品store + 购物车store
 export const useGoods = defineStore("goods", {
  state: () => ({
+    remark: "", // 订单备注 
    showVipPrice: 0,
    allSelected: 0, // 是否整单打包
    vipUserInfo: {}, // 会员信息
--- a/src/store/print.js
+++ b/src/store/print.js
@@ -75,14 +75,22 @@ export const usePrint = defineStore("print", {
        return ipReg.test(printer.address);
      }

-      if (printer.connectionType === "usb") {
+      if (printer.connectionType === "USB") {
        return this.localDevices.some(item => item.name === printer.address);
      }
      return false;
    },

+    // 辅助方法：判断是否为特殊费用项（餐位费/打包费）
+    isSpecialFeeItem(item) {
+      // 可根据实际业务调整判断条件，比如通过名称/标识判断
+      const specialNames = ["餐位费", "打包费"];
+      // 条件：1. 无categoryId  2. 名称包含特殊费用关键词 或 标记了特殊标识
+      return !item.categoryId && (item.isSpecialFee || specialNames.some(name => item.name?.includes(name)));
+    },
+
    // ==============================
-    // 最终完美版 → 空数组打印全部
+    // 优化：保留无categoryId的特殊费用项，兼容原有分类过滤逻辑
    // ==============================
    pushReceiptData(props, isDevice = true) {
      if (!isDevice) {
@@ -105,15 +113,15 @@ export const usePrint = defineStore("print", {
      validPrinters.forEach(printer => {
        let filterCarts = [];

-        // ======================================
-        // ✅ 核心：分类为空数组 → 打印全部菜品
-        // ======================================
+        // 核心过滤逻辑：
+        // 1. 分类为空 → 打印全部（包含特殊费用项）
+        // 2. 分类非空 → 打印「匹配分类的商品」+「无categoryId的特殊费用项」
        if (!printer.categoryList || printer.categoryList.length === 0) {
          filterCarts = props.carts || [];
        } else {
-          // 有分类 → 只打印对应分类
          filterCarts = (props.carts || []).filter(item => {
-            return printer.categoryList.includes(item.categoryId);
+            // 保留：特殊费用项（无categoryId） + 匹配分类的商品（有categoryId）
+            return this.isSpecialFeeItem(item) || printer.categoryList.includes(item.categoryId);
          });
        }

@@ -199,90 +207,82 @@ export const usePrint = defineStore("print", {
    },

    // ————————————————————————————————
-    // 以下原有代码完全不动（除了printWork方法）
+    // 以下原有代码完全保留，仅优化格式和可读性
    // ————————————————————————————————
    checkLocalPrint(address) {
-      let print = "";
-      for (let item of this.localDevices) {
-        if (item.name == address) {
-          print = item;
-        }
-      }
-      if (!print.name) {
-        return false;
-      } else {
-        return true;
-      }
+      const targetPrinter = this.localDevices.find(item => item.name === address);
+      return !!targetPrinter?.name;
    },

    labelPrint(props) {
      const store = useUser();
-      if (
-        this.deviceLableList.length &&
-        this.checkLocalPrint(this.deviceLableList[0].address)
-      ) {
-        let pids = this.deviceLableList[0].categoryList;
-        let count = 0;
-        let sum = 0;
-        props.carts.map((item) => {
-          if (pids.some((el) => el == item.categoryId)) {
-            for (let i = 0; i < item.number; i++) {
-              sum++;
-            }
-          }
-        });
-        props.carts.map((item) => {
-          if (pids.some((el) => el == item.categoryId)) {
-            for (let i = 0; i < item.number; i++) {
-              count++;
-              this.labelList.push({
-                outNumber: props.outNumber,
-                name: item.name,
-                skuName: item.skuName,
-                masterId: props.orderInfo.tableName,
-                deviceName: this.deviceLableList[0].address,
-                createdAt: dayjs(props.createdAt).format("YYYY-MM-DD HH:mm:ss"),
-                isPrint: false,
-                count: `${count}/${sum}`,
-                ticketLogo: store.shopInfo.ticketLogo,
-              });
-            }
-          }
-        });
-        this.startLabelPrint();
-      } else {
+      const validLabelPrinter = this.deviceLableList[0];
+
+      if (!validLabelPrinter || !this.checkLocalPrint(validLabelPrinter.address)) {
        console.log("标签打印：未在本机查询到打印机");
+        return;
      }
+
+      const pids = validLabelPrinter.categoryList;
+      let totalCount = 0;
+      let currentCount = 0;
+
+      // 先计算总打印数量
+      props.carts.forEach(item => {
+        if (pids.some(el => el === item.categoryId)) {
+          totalCount += item.number;
+        }
+      });
+
+      // 构建标签打印列表
+      props.carts.forEach(item => {
+        if (pids.some(el => el === item.categoryId)) {
+          for (let i = 0; i < item.number; i++) {
+            currentCount++;
+            this.labelList.push({
+              outNumber: props.outNumber,
+              name: item.name,
+              skuName: item.skuName,
+              masterId: props.orderInfo.tableName,
+              deviceName: validLabelPrinter.address,
+              createdAt: dayjs(props.createdAt).format("YYYY-MM-DD HH:mm:ss"),
+              isPrint: false,
+              count: `${currentCount}/${totalCount}`,
+              ticketLogo: store.shopInfo.ticketLogo,
+            });
+          }
+        }
+      });
+
+      this.startLabelPrint();
    },

    startLabelPrint() {
      if (this.printTimer != null) return;
+
      this.printTimer = setInterval(() => {
-        let item = "";
        if (!this.labelList.length) {
          clearInterval(this.printTimer);
          this.printTimer = null;
-        } else {
-          item = this.labelList[0];
-          if (!item.isPrint) {
-            ipcRenderer.send("printerTagSync", JSON.stringify(item));
-            this.labelList[0].isPrint = true;
-            this.labelList.splice(0, 1);
-          }
+          return;
+        }
+
+        const item = this.labelList[0];
+        if (!item.isPrint) {
+          ipcRenderer.send("printerTagSync", JSON.stringify(item));
+          this.labelList[0].isPrint = true;
+          this.labelList.splice(0, 1);
        }
      }, 2000);
    },

    // 打印交班小票（优化：1. 新增handoverSwitch=1才打印 2. 兼容局域网打印机）
    printWork(data) {
-      // 筛选条件：
-      // 1. 状态启用 + 小票类型 + handoverSwitch=1 
-      // 2. 打印机可用 
-      // 3. 打印服务正常
+      // 筛选条件：状态启用 + 小票类型 + handoverSwitch=1 + 打印机可用 + 打印服务正常
      const validPrinters = this.deviceNoteList.filter(p => {
        return p.status
          && p.subType === "cash"
-          && p.handoverSwitch === 1  // 新增：只有handoverSwitch为1的打印机才打印交班小票
+          && p.handoverSwitch === 1
          && this.checkPrinterAvailable(p)
          && this.isPrintService;
      });
@@ -305,13 +305,11 @@ export const usePrint = defineStore("print", {
        try {
          // 区分局域网和USB打印机
          if (printer.connectionType === "局域网") {
-            // 局域网打印机：使用networkPrint指令
            ipcRenderer.send('printHandoverReceipt', JSON.stringify({
              printerIp: printer.address,
              handoverData: printData
            }));
          } else {
-            // USB打印机：使用原有LODOP方式
            lodopPrintWork(printData);
          }
          console.log("✅ 交班小票打印成功:", printer.address);
@@ -322,22 +320,19 @@ export const usePrint = defineStore("print", {
    },

    printInvoice(data) {
-      if (
-        this.deviceNoteList.length &&
-        this.checkLocalPrint(this.deviceNoteList[0].address)
-      ) {
-        data.deviceName = this.deviceNoteList[0].address;
-        invoicePrint(data);
-      } else {
+      const validPrinter = this.deviceNoteList[0];
+      if (!validPrinter || !this.checkLocalPrint(validPrinter.address)) {
        console.log("订单发票：未在本机查询到打印机");
+        return;
      }
+
+      data.deviceName = validPrinter.address;
+      invoicePrint(data);
    },
-    // 退菜/退款
+
+    // 退款小票打印
    printRefund(data) {
-      // 筛选条件：
-      // 1. 状态启用 + 小票类型 
-      // 2. 打印机可用 
-      // 3. 打印服务正常
+      // 筛选条件：状态启用 + 小票类型 + 打印机可用 + 打印服务正常
      const validPrinters = this.deviceNoteList.filter(p => {
        return p.status
          && p.subType === "cash"
@@ -367,13 +362,11 @@ export const usePrint = defineStore("print", {
        try {
          // 区分局域网和USB打印机
          if (printer.connectionType === "局域网") {
-            // 局域网打印机：使用networkPrint指令
            ipcRenderer.send('printRefund', JSON.stringify({
              printerIp: printer.address,
              orderData: printData
            }));
          } else {
-            // USB打印机：使用原有LODOP方式
            refundPrint(printData);
          }
          console.log("✅ 退单小票打印成功:", printer.address);
@@ -381,6 +374,52 @@ export const usePrint = defineStore("print", {
          console.error("❌ 退单小票打印失败:", printer.address, error);
        }
      });
+    },
+
+    // 退菜小票打印
+    printRefundDish(data) {
+      // 筛选条件：状态启用 + 小票类型 + 打印机可用 + 打印服务正常
+      const validPrinters = this.deviceNoteList.filter(p => {
+        return p.status
+          && p.subType === "cash"
+          && this.checkPrinterAvailable(p)
+          && this.isPrintService;
+      });
+
+      if (validPrinters.length === 0) {
+        console.log("退菜：无符合条件的可用打印机");
+        return;
+      }
+
+      const store = useUser();
+      // 遍历符合条件的打印机打印
+      validPrinters.forEach(printer => {
+        const printData = {
+          ...data,
+          deviceId: printer.id,
+          deviceName: printer.address,
+          printerName: printer.name,
+          connectionType: printer.connectionType,
+          shop_name: store.shopInfo.shopName,
+          loginAccount: store.userInfo.name,
+          printTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+        };
+
+        try {
+          // 区分局域网和USB打印机
+          if (printer.connectionType === "局域网") {
+            ipcRenderer.send('printRefundDish', JSON.stringify({
+              printerIp: printer.address,
+              orderData: printData
+            }));
+          } else {
+            refundPrint(printData);
+          }
+          console.log("✅ 退菜小票打印成功:", printer.address);
+        } catch (error) {
+          console.error("❌ 退菜小票打印失败:", printer.address, error);
+        }
+      });
    }
  },
 });
--- a/src/store/socket.js
+++ b/src/store/socket.js
@@ -169,11 +169,17 @@ export const useSocket = defineStore("socket", {
              }
            }
          } else if (data.data_type == "order") {
+            goodsStore.successClearCart();
+            goodsStore.historyOrderAjax(data.data.table_code);
+            this.cartInit();
+
+
            // 收到订单消息，打印订单小票
            let orderInfo = data.data.split("_");
            let orderId = orderInfo[0]; // 订单ID
            let orderModel = orderInfo[1]; // 订单类型
-            let orderStatus = orderInfo[2]; // 订单状态
+            let orderStatus = orderInfo[2]; // 订单ID_先付后付(1先付0后付)_订单状态 0未完成 1完成_第几次下单 
+            let placeNum = orderInfo[3]; // 下单次数

            let printList = useStorage.get("printList") || [];

@@ -189,6 +195,35 @@ export const useSocket = defineStore("socket", {
              this.orderList.push(orderId);
              this.startPrintInterval();
            }
+
+            // 防止重复打印客看单
+            if (orderStatus == 0) {
+              getOrderByIdAjax(orderId).then(res => {
+                let originOrderInfo = res
+                originOrderInfo.detailMap = _.at(originOrderInfo.detailMap, placeNum);
+
+                console.log('originOrderInfo', originOrderInfo);
+
+                let amout = 0
+                originOrderInfo.detailMap.flat().forEach(item => {
+                  amout += item.num * item.unitPrice
+                });
+
+                originOrderInfo.originAmount = amout
+
+                if (originOrderInfo.placeNum == 1 && originOrderInfo.dineMode == 'dine-in') {
+                  originOrderInfo.originAmount += originOrderInfo.seatAmount
+                }
+
+                if (originOrderInfo.packFee > 0) {
+                  originOrderInfo.originAmount += originOrderInfo.packFee
+                }
+
+                printStore.pushReceiptData(commOrderPrintData({ ...originOrderInfo, isGuest: true, isBefore: false }));
+              }).catch(err => {
+                console.log(err);
+              })
+            }
          } else if (data.data_type == "product_update") {
            // 商品更新
            this.updateGoods();
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -184,12 +184,19 @@ export function commOrderPrintData(orderInfo) {
  if (orderInfo.isGuest) {
    // 如果是客看单，只展示当前下单的菜品
    orderInfo.detailMap[0].map((item) => {
+      let price = 0
+      if (item.discountSaleAmount > 0) {
+        price = item.discountSaleAmount
+      } else {
+        price = item.price
+      }
+
      data.carts.push({
        categoryId: item.categoryId,
-        name: item.productName,
-        number: item.num,
+        name: item.isGift === 1 ? `[赠]${item.productName}` : item.productName,
+        number: item.num - item.returnNum,
        skuName: item.skuName,
-        salePrice: formatDecimal(+item.price),
+        salePrice: formatDecimal(+price),
        totalAmount: formatDecimal(+item.payAmount),
        proGroupInfo: item.proGroupInfo
          ? item.proGroupInfo.map((item) => item.goods).flat()
@@ -198,13 +205,19 @@ export function commOrderPrintData(orderInfo) {
    });
  } else {
    orderInfo.cartList.map((item) => {
+      let price = 0
+      if (item.discountSaleAmount > 0) {
+        price = item.discountSaleAmount
+      } else {
+        price = item.price
+      }
      data.carts.push({
        categoryId: item.categoryId,
-        name: item.productName,
-        number: item.num,
+        name: item.isGift === 1 ? `[赠]${item.productName}` : item.productName,
+        number: item.num - item.returnNum,
        skuName: item.skuName,
-        salePrice: formatDecimal(+item.price),
-        totalAmount: formatDecimal(+item.payAmount),
+        salePrice: formatDecimal(+price),
+        totalAmount: formatDecimal((item.num - item.returnNum) * price),
        proGroupInfo: item.proGroupInfo
          ? item.proGroupInfo.map((item) => item.goods).flat()
          : "",
@@ -212,23 +225,41 @@ export function commOrderPrintData(orderInfo) {
    });
  }

-  if (orderInfo.seatAmount > 0) {
-    data.carts.push({
-      categoryId: '',
-      name: '餐位费',
-      number: orderInfo.seatNum,
-      skuName: '',
-      salePrice: formatDecimal(orderInfo.seatAmount / orderInfo.seatNum),
-      totalAmount: orderInfo.seatAmount,
-      proGroupInfo: "",
-    })
+  if (orderInfo.dineMode == 'dine-in') {
+    if (orderInfo.seatAmount > 0 && orderInfo.isGuest && orderInfo.placeNum == 1 && !orderInfo.isRefundDish) {
+      data.carts.push({
+        categoryId: '',
+        name: '餐位费',
+        number: orderInfo.seatNum,
+        skuName: '',
+        salePrice: formatDecimal(orderInfo.seatAmount / orderInfo.seatNum),
+        totalAmount: orderInfo.seatAmount,
+        proGroupInfo: "",
+      })
+    }
+
+    if (orderInfo.seatAmount > 0 && !orderInfo.isGuest && !orderInfo.isRefundDish) {
+      data.carts.push({
+        categoryId: '',
+        name: '餐位费',
+        number: orderInfo.seatNum,
+        skuName: '',
+        salePrice: formatDecimal(orderInfo.seatAmount / orderInfo.seatNum),
+        totalAmount: orderInfo.seatAmount,
+        proGroupInfo: "",
+      })
+    }
  }

-  if (orderInfo.packFee > 0) {
+  if (orderInfo.packFee > 0 && !orderInfo.isRefundDish) {
+    let packNum = 0;
+    orderInfo.cartList.forEach(item => {
+      packNum += item.packNumber
+    })
    data.carts.push({
      categoryId: '',
      name: '打包费',
-      number: '',
+      number: packNum,
      skuName: '',
      salePrice: '',
      totalAmount: formatDecimal(orderInfo.packFee),
@@ -236,6 +267,7 @@ export function commOrderPrintData(orderInfo) {
    })
  }

+  console.log('最终组合打印数据===', data);
  return data;
 }

--- a/src/views/home/components/cartOperation.vue
+++ b/src/views/home/components/cartOperation.vue
@@ -262,11 +262,12 @@ import { inputFilterFloat, formatDecimal, getOrderByIdAjax, commOrderPrintData }
 import { refundOrder } from '@/api/order.js'
 import { useSocket } from '@/store/socket.js'
 import { usePrint } from '@/store/print.js'
+import { useUser } from '@/store/user.js'

 const goodsStore = useGoods()
 const socket = useSocket()
 const printStore = usePrint()
-
+const store = useUser()
 const tableMergingRef = ref(null)

 const props = defineProps({
@@ -337,7 +338,9 @@ async function returnOrderItemAjax(num = 1) {
                    returnAmount: goodsStore.cartOrderItem.lowPrice,
                    num: num
                }
-            ]
+            ],
+            operator: store.userInfo.name || store.shopInfo.shopName,
+            print: printStore.deviceNoteList.length ? false : true
        }
        await refundOrder(data)
        goodsStore.cartOrderItem.returnNum += num
@@ -345,19 +348,13 @@ async function returnOrderItemAjax(num = 1) {

        getOrderByIdAjax(goodsStore.orderListInfo.id).then(res => {
            let originOrderInfo = res
-            console.log('originOrderInfo1===', originOrderInfo);
-            
-            console.log('goodsStore.cartOrderItem.id', goodsStore.cartOrderItem.id);
-
            let index = originOrderInfo.cartList.findIndex(item => item.id == goodsStore.cartOrderItem.id)
-
-            console.log('index===', index);
-
            originOrderInfo.cartList = _.at(originOrderInfo.cartList, index);
-            console.log('originOrderInfo2===', originOrderInfo);
-            // return
+            originOrderInfo.cartList[0].num = num
+            originOrderInfo.cartList[0].returnNum = 0
+            originOrderInfo.cartList[0].payAmount = num * originOrderInfo.cartList[0].price

-            printStore.printRefund(commOrderPrintData({ ...originOrderInfo, isGuest: false, isBefore: false, title: '退菜单' }));
+            printStore.printRefundDish(commOrderPrintData({ ...originOrderInfo, isRefundDish: true }));
        }).catch(err => {
            console.log(err);
        })
--- a/src/views/home/components/settleAccount.vue
+++ b/src/views/home/components/settleAccount.vue
@@ -204,14 +204,55 @@ const printHandle = _.throttle(async function () {
  await printOrderLable(true)
 }, 1500, { leading: true, trailing: false })

+
+// 在 usePrint 的 actions 中添加（比如放在 pushReceiptData 方法下方） 
+function calcAllCartsTotalSum(cartObj) {
+  // 初始化总和为0
+  let totalSum = 0;
+  // 遍历原始对象的所有键（0、1、2...）
+  Object.keys(cartObj).forEach(key => {
+    const carts = cartObj[key] || [];
+    // 累加当前分类下的菜品总价（num × unitPrice）
+    carts.forEach(item => {
+      const num = Number(item.num) - Number(item.returnNum) || 0; // 防错：非数字转0
+      const unitPrice = Number(item.unitPrice) || 0;
+      totalSum += num * unitPrice;
+    });
+  });
+  return totalSum; // 返回所有菜品的总价总和
+}
+
 // 打印订单标签
 async function printOrderLable(isBefore = false) {
  try {
    let orderId = goodsStore.orderListInfo.id
-    const data = await getOrderByIdAjax(orderId);
+    let data = await getOrderByIdAjax(orderId);
+
+    console.log(`打印订单标签数据${isBefore}===`, data);
+
+    if (isBefore) {
+      data.originAmount = calcAllCartsTotalSum(data.detailMap)
+    }
+
+    if (data.seatAmount > 0 && data.dineMode == 'dine-in' && isBefore) {
+      data.originAmount += data.seatAmount
+    }
+
+    let packFee = 0
+
+    data.cartList.forEach(item => {
+      packFee += item.num - item.returnNum * item.packAmount
+    })
+
+    if (packFee > 0 && isBefore) {
+      data.originAmount += packFee
+      data.packFee = packFee
+    }

    let printList = useStorage.get("printList") || [];

+    console.log('printStore.deviceNoteList.length:', printStore.deviceNoteList.length);
+
    // 防止重复打印
    if (!printList.some((el) => el == orderId)) {
      if (!isBefore) {
@@ -225,7 +266,7 @@ async function printOrderLable(isBefore = false) {
          printStore.labelPrint(commOrderPrintData(data))
        }
      }
-
+      console.log('printStore.deviceNoteList', printStore.deviceNoteList);
      if (printStore.deviceNoteList.length) {
        // 使用本地打印机打印
        printStore.pushReceiptData(commOrderPrintData({ ...data, isBefore: isBefore }));
@@ -248,7 +289,7 @@ async function printOrderLable(isBefore = false) {

 // 订单已支付
 function paySuccess() {
-  // if (isPrint.value) printOrderLable()
+  if (isPrint.value) printOrderLable()
  emits('success')
  dialogVisible.value = false;
  ElMessage.success('支付成功')
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -189,7 +189,7 @@
    </div>
  </div>
  <!-- 备注 -->
-  <remarkModal ref="remarkRef" @success="(e) => (remark = e)" />
+  <remarkModal ref="remarkRef" @success="(e) => (goodsStore.remark = e)" />
  <!-- 修改取餐号 -->
  <takeFoodCode />
  <el-drawer v-model="membershow" :with-header="true" size="90%" title="选择会员">
@@ -197,7 +197,7 @@
  </el-drawer>
  <!-- <takeFoodCode ref="takeFoodCodeRef" title="修改取餐号" placeholder="请输入取餐号" @success="takeFoodCodeSuccess" /> -->
  <!-- 结算订单 -->
-  <settleAccount ref="settleAccountRef" :cart="cartList" :amount="cartInfo.totalAmount" :remark="remark"
+  <settleAccount ref="settleAccountRef" :cart="cartList" :amount="cartInfo.totalAmount" :remark="goodsStore.remark"
    :orderInfo="orderInfo" @success="" />
  <!-- 快捷收银 -->
  <fastCashier ref="fastCashierRef" type="0" />
@@ -253,7 +253,6 @@ const pendingCartModalRef = ref(null);
 const settleAccountRef = ref(null);
 const fastCashierRef = ref(null);
 const tableMergingRef = ref(null)
-const remark = ref("");
 const cartListActive = ref(0);
 const cartListActiveItem = ref({})
 const cartList = ref([]);
@@ -310,7 +309,7 @@ async function createOrderHandle(t = 0) {
        originAmount: goodsStore.cartInfo.costSummary.goodsOriginalAmount,
        tableCode: goodsStore.cartList[0].table_code, // 台桌号
        dineMode: goodsStore.allSelected ? store.shopInfo.eatModel.split(',')[1] : store.shopInfo.eatModel.split(',')[0], // 用餐方式
-        remark: remark.value, // 备注
+        remark: goodsStore.remark, // 备注
        placeNum: placeNum + 1, // 下单次数
        waitCall: 0, // 是否叫号
        userId: goodsStore.vipUserInfo.userId || '', // 会员用户id
@@ -331,16 +330,31 @@ async function createOrderHandle(t = 0) {
        } else {
          goodsStore.clearCart()
          // 开始打印客看单,可看单需要剔除其他历史下单
-          getOrderByIdAjax(res.id).then(res => {
-            let originOrderInfo = res
-            originOrderInfo.detailMap = _.at(originOrderInfo.detailMap, placeNum + 1);
+          // getOrderByIdAjax(res.id).then(res => {
+          //   let originOrderInfo = res
+          //   originOrderInfo.detailMap = _.at(originOrderInfo.detailMap, placeNum + 1);

-            console.log('originOrderInfo', originOrderInfo);
+          //   console.log('originOrderInfo', originOrderInfo);

-            printStore.pushReceiptData(commOrderPrintData({ ...originOrderInfo, isGuest: true, isBefore: true }));
-          }).catch(err => {
-            console.log(err);
-          })
+          //   let amout = 0
+          //   originOrderInfo.detailMap.flat().forEach(item => {
+          //     amout += item.num * item.unitPrice
+          //   });
+
+          //   originOrderInfo.originAmount = amout
+
+          //   if (originOrderInfo.placeNum == 1 && originOrderInfo.dineMode == 'dine-in') {
+          //     originOrderInfo.originAmount += originOrderInfo.seatAmount
+          //   }
+
+          //   if (originOrderInfo.packFee > 0) {
+          //     originOrderInfo.originAmount += originOrderInfo.packFee
+          //   }
+
+          //   printStore.pushReceiptData(commOrderPrintData({ ...originOrderInfo, isGuest: true, isBefore: false }));
+          // }).catch(err => {
+          //   console.log(err);
+          // })
        }
        // 清除购物车，更新历史订单
        goodsStore.updateOrderList()
--- a/src/views/member/components/StoreWineManagement.vue
+++ b/src/views/member/components/StoreWineManagement.vue
@@ -30,11 +30,16 @@
                    <el-table :data="list" height="100%" border stripe>
                        <el-table-column label="记录" prop="name"></el-table-column>
                        <el-table-column label="数量" prop="num"></el-table-column>
-                        <el-table-column label="操作时间" prop="expTime"></el-table-column>
-                        <el-table-column label="操作" width="150">
+                        <el-table-column label="到期时间" prop="expTime"></el-table-column>
+                        <el-table-column label="操作" width="250">
                            <template #default="{ row }">
-                                <el-button type="danger" :disabled="row.num <= 0"
-                                    @click="takeWineDialogVisible = true; maxTakeNum = row.num; takeWineForm.id = row.id;">取酒</el-button>
+                                <el-button type="primary" @click="viewRecord(row)">查看记录</el-button>
+                                <el-button type="danger" :disabled="isExpired(row.expTime) || row.num <= 0"
+                                    @click="takeWineDialogVisible = true; maxTakeNum = row.num; takeWineForm.id = row.id;">
+                                    <span v-if="isExpired(row.expTime) || row.status == 2">已过期</span>
+                                    <span v-else-if="row.num <= 0">已取完</span>
+                                    <span v-else>取酒</span>
+                                </el-button>
                            </template>
                        </el-table-column>
                    </el-table>
@@ -85,12 +90,19 @@
            </div>
        </div>
    </el-dialog>
+    <!-- 存取酒记录弹窗 -->
+    <el-dialog title="记录" width="600px" v-model="showRecordDialogVisible">
+        <el-table :data="recordList" border stripe>
+            <el-table-column label="记录" prop="content"></el-table-column>
+            <el-table-column label="操作时间" prop="time"></el-table-column>
+        </el-table>
+    </el-dialog>
 </template>

 <script setup>
 import { ref, onMounted } from "vue";
 import { ElMessage } from 'element-plus'
-import { shopStoragePost, storageGoodGet, shopStorageGet, shopStoragePut } from '@/api/product_new'
+import { shopStoragePost, storageGoodGet, shopStorageGet, shopStoragePut, shopStorageRecord } from '@/api/product_new'

 const props = defineProps({
    userInfo: {
@@ -214,6 +226,30 @@ function init() {
    list.value = [];
 }

+function isExpired(expTime) {
+    if (!expTime) return false;
+    const now = new Date();
+    const expDate = new Date(expTime);
+    return expDate < now;
+}
+
+// 查看记录
+const showRecordDialogVisible = ref(false);
+const recordList = ref([]);
+async function viewRecord(row) {
+    try {
+        showRecordDialogVisible.value = true;
+        const res = await shopStorageRecord({
+            id: row.id,
+            page: 1,
+            size: 999,
+        });
+        recordList.value = res || [];
+    } catch (error) {
+        console.error('获取存取酒记录失败:', error);
+    }
+}
+
 function show() {
    init();
    drawerVisible.value = true;
--- a/src/views/order/components/refundDrawer.vue
+++ b/src/views/order/components/refundDrawer.vue
@@ -174,15 +174,15 @@ async function passwordSuccess(e = '') {
        loading.value = true
        let rows = tableRef.value.getSelectionRows()
        let refundDetails = []
-        if (refundType.value != 1) {
-            refundDetails = tableRef.value.getSelectionRows().map(val => {
-                return {
-                    id: val.id,
-                    returnAmount: val.payAmount,
-                    num: val.refund_number
-                }
-            })
-        }
+        // if (refundType.value != 1) {
+        refundDetails = tableRef.value.getSelectionRows().map(val => {
+            return {
+                id: val.id,
+                returnAmount: val.payAmount,
+                num: val.refund_number
+            }
+        })
+        // }

        let data = {
            orderId: item.value.id,
@@ -192,6 +192,8 @@ async function passwordSuccess(e = '') {
            refundReason: remark.value,
            refundDetails: refundDetails,
            pwd: e,
+            operator: store.userInfo.name || store.shopInfo.shopName,
+            print: printStore.deviceNoteList.length ? false : true
        };

        await refundOrder(data)
@@ -269,7 +271,7 @@ async function printRefund(rows) {
                orderInfo: item.value,
                outNumber: item.value.id,
                createdAt: item.value.createTime,
-                refundMethod: cash.value ? '现金' : '原路退回',
+                refundMethod: cash.value ? '线下退款' : '原路退回',
                printTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
            }

@@ -277,10 +279,10 @@ async function printRefund(rows) {
                data.carts.push(
                    {
                        name: item.productName,
-                        number: item.num,
+                        number: item.refund_number,
                        skuName: item.skuName,
                        salePrice: formatDecimal(+item.unitPrice),
-                        totalAmount: formatDecimal(+item.payAmount)
+                        totalAmount: formatDecimal(+item.unitPrice * item.refund_number)
                    }
                )
            })
@@ -288,8 +290,8 @@ async function printRefund(rows) {
            printStore.printRefund(data);
        } else {
            // 云打印
-            await orderPrint({ id: item.value.id, type: 2 })
-            ElMessage.success('云打印退款单成功')
+            // await orderPrint({ id: item.value.id, type: 2 })
+            // ElMessage.success('云打印退款单成功')
        }
    } catch (error) {
        console.log(error);
--- a/src/views/work/index.vue
+++ b/src/views/work/index.vue
@@ -26,7 +26,7 @@
                            </div>
                            <div class="box_content_left_top_item_top">
                                <div style="color:#ff5252; font-size: 30px;">
-                                    ￥{{ formatDecimal(infoData.handAmount || 0) }}
+                                    ￥{{ formatDecimal(infoData.orderTurnover || 0) }}
                                </div>
                                <div style="margin-top: 6px; color: #666;">
                                    营业额
@@ -36,7 +36,7 @@
                        <div class="box_content_left_top_item">
                            <div class="box_content_left_top_item_botton">
                                <div style=" font-size: 20px;">
-                                    ￥{{ formatDecimal(infoData.cashAmount || 0) }}
+                                    ￥{{ formatDecimal(infoData.cash || 0) }}
                                </div>
                                <div style="margin-top: 6px;">
                                    现金支付
@@ -179,26 +179,18 @@ const exit = async () => {
        if (loading.value) return
        loading.value = true;
        // await staffPermission('yun_xu_jiao_ban')
-
-        // const res = await handover(isPrint.value)
-        // const data = await handoverData(res)
-
-        const res = '136'
-        const data = { "accountType": "merchant", "alipayAmount": 0, "cashAmount": 38.5, "categoryDataList": [{ "amount": 8.7, "categoryId": "614", "categoryName": "主食", "num": 3, "quantity": 1 }, { "amount": 29.8, "categoryId": "615", "categoryName": "炒菜", "num": 5, "quantity": 4 }], "creditAmount": 0, "handAmount": 38.5, "handoverTime": "2026-04-02 18:19:45", "id": "136", "loginTime": "2026-04-02 18:17:57", "orderCount": 1, "productDataList": [{ "amount": 8.7, "num": 3, "productId": "4037", "productName": "金镶白玉板", "skuId": "6727", "skuName": "" }, { "amount": 8.8, "num": 1, "productId": "4039", "productName": "雪底红梅", "skuId": "6729", "skuName": "" }, { "amount": 1.2, "num": 1, "productId": "4045", "productName": "清蒸鲈鱼", "skuId": "6738", "skuName": "微辣,中度酸" }, { "amount": 2, "num": 1, "productId": "4046", "productName": "四喜丸子", "skuId": "6741", "skuName": "" }, { "amount": 17.8, "num": 2, "productId": "4295", "productName": "小烤串", "skuId": "6990", "skuName": "" }], "quickInAmount": 0, "refundAmount": 0, "shopId": "151", "shopName": "高歌的小店", "staffId": "151", "staffName": "高歌的小店", "vipPay": 0, "vipRecharge": 0, "wechatAmount": 0 }
-
-        // console.log('res===', JSON.stringify(res));
-        // console.log('data===', JSON.stringify(data));
-
+        await handover(printStore.deviceNoteList.length ? 0 : 1)
        if (printStore.deviceNoteList.length) {
+            printStore.printWork(infoData.value)
            // 使用本地打印机 打印交班数据
-            data.printTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-            data.printShop = isPrint.value
-            printStore.printWork(data)
-        } else {
-            // 使用云打印机 打印交班数据
-            await handoverNetworkPrint(data.id)
+            // data.printTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+            // data.printShop = isPrint.value
        }
-        // logoutHandle()
+        //  else {
+        //     // 使用云打印机 打印交班数据
+        //     await handoverNetworkPrint(data.id)
+        // }
+        logoutHandle()
        loading.value = false;
    } catch (error) {
        loading.value = false;