From 0ada3a04668f86f3c0cdd907241e5e8773add57b Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 3 Apr 2026 15:18:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E7=8F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AuthorizationServiceImpl.java | 1 - .../czg/service/order/print/PrinterImpl.java | 51 +++++++++---------- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java index d0e91f5d7..00fa347c2 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java @@ -193,7 +193,6 @@ public class AuthorizationServiceImpl implements AuthorizationService { } redisService.del(RedisCst.LOGIN_CODE + loginDTO.uuid()); - System.out.println(StpKit.USER.getMainShopId()); return new LoginVO(StpKit.USER.getTokenInfo(), promissionList, loginDTO.loginType(), shopInfo, shopStaff); } 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 76a5b3cd0..9d7ca290f 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 @@ -182,34 +182,33 @@ public interface PrinterImpl { StringBuilder builder = new StringBuilder() .append(getFormatLabel(handoverRecord.getShopName(), signLabelInfo.center, signLabelInfo.s)).append(signLabelInfo.br) .append(getFormatLabel("交班小票", signLabelInfo.s, signLabelInfo.center)).append(signLabelInfo.br) - .append("交班时间: ").append(DateUtil.format(handoverRecord.getHandoverTime(), "yyyy/MM/dd HH:mm:ss")).append(signLabelInfo.br) - .append("收银员: ").append(handoverRecord.getStaffName()).append(signLabelInfo.br) - .append("交班周期: ") - .append(DateUtil.format(handoverRecord.getLoginTime(), "MM/dd HH:mm")) - .append("--") - .append(DateUtil.format(handoverRecord.getHandoverTime(), "MM/dd HH:mm")) + .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") + "--" + + DateUtil.format(handoverRecord.getHandoverTime(), "MM/dd HH:mm"), signLabelInfo.s)).append(signLabelInfo.br) + .append(signLabelInfo.br) .append(signLabelInfo.br) - .append(signLabelInfo.br) - .append("当班营业总额: ").append(handoverRecord.getHandAmount()).append(signLabelInfo.br) - .append("实际收款的支付方式").append(signLabelInfo.br) - .append(leftRightAlign(" 现金:", handoverRecord.getCashAmount().toPlainString(), 32)).append(signLabelInfo.br) - .append(leftRightAlign(" 微信:", handoverRecord.getWechatAmount().toPlainString(), 32)).append(signLabelInfo.br) - .append(leftRightAlign(" 支付宝:", handoverRecord.getAlipayAmount().toPlainString(), 32)).append(signLabelInfo.br) - .append(leftRightAlign(" 二维码收款:", "", 32)).append(signLabelInfo.br) - .append(leftRightAlign(" 扫码收款:", "", 32)).append(signLabelInfo.br) - .append(leftRightAlign(" 充值:", handoverRecord.getVipRecharge().toPlainString(), 32)).append(signLabelInfo.br) - .append("非实际收款的支付方式").append(signLabelInfo.br) - .append(leftRightAlign(" 挂账:", handoverRecord.getCreditAmount().toPlainString(), 32)).append(signLabelInfo.br) - .append(leftRightAlign(" 余额:", handoverRecord.getVipPay().toPlainString(), 32)).append(signLabelInfo.br) - .append(getFormatLabel("--------------------------------", signLabelInfo.s)) - .append("退菜/退款").append(signLabelInfo.br).append(signLabelInfo.br) - .append(leftRightAlign(" 退款金额:", handoverRecord.getRefundAmount().toPlainString(), 32)).append(signLabelInfo.br) - .append(leftRightAlign(" 退菜数量:", "", 32)).append(signLabelInfo.br) - .append(getFormatLabel("--------------------------------", signLabelInfo.s)) - .append(leftRightAlign("订单（数量/订单总额）", handoverRecord.getOrderCount() + "" + handoverRecord.getHandAmount(), 32)).append(signLabelInfo.br) - .append(getFormatLabel("----------- 销售数据 ------------", signLabelInfo.s)) - .append(getFormatLabel(formatItemLine("商品分类", "数量", "总计", 18, 9), signLabelInfo.s)); + .append(getFormatLabel("当班营业总额: " + handoverRecord.getHandAmount(), signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel("实际收款的支付方式", signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel(leftRightAlign(" 现金:", handoverRecord.getCashAmount().toPlainString(), 32), signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel(leftRightAlign(" 微信:", handoverRecord.getWechatAmount().toPlainString(), 32), signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel(leftRightAlign(" 支付宝:", handoverRecord.getAlipayAmount().toPlainString(), 32), signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel(leftRightAlign(" 二维码收款:", "", 32), signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel(leftRightAlign(" 扫码收款:", "", 32), signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel(leftRightAlign(" 充值:", handoverRecord.getVipRecharge().toPlainString(), 32), signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel("非实际收款的支付方式", signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel(leftRightAlign(" 挂账:", handoverRecord.getCreditAmount().toPlainString(), 32), signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel(leftRightAlign(" 余额:", handoverRecord.getVipPay().toPlainString(), 32), signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel("--------------------------------", signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel("退菜/退款", signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel(leftRightAlign(" 退款金额:", handoverRecord.getRefundAmount().toPlainString(), 32), signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel(leftRightAlign(" 退菜数量:", "", 32), signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel("--------------------------------", signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel(leftRightAlign("订单（数量/订单总额）", handoverRecord.getOrderCount() + "/" + handoverRecord.getHandAmount(), 32), signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel("----------- 销售数据 ------------", signLabelInfo.s)).append(signLabelInfo.br) + .append(getFormatLabel(formatItemLine("商品分类", "数量", "总计", 18, 9), signLabelInfo.s)) + .append(signLabelInfo.br); if (StrUtil.isNotBlank(handoverRecord.getCategoryData())) { JSONArray.parseArray(handoverRecord.getCategoryData()).forEach(item -> {