czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

交班

Browse Source
This commit is contained in:
wangw
2026-04-03 15:18:07 +08:00
parent 49babaa814
commit 0ada3a0466
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java
View File

@@ -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);
}

51
cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
View File

@@ -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 -> {