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-16 18:14:58 +08:00
parent 5e40f91bea
commit b854c9bc0f
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java
View File

@@ -85,7 +85,7 @@ public class PrintMqListener {
String printTypeEnum = jsonObject.getString("printTypeEnum"); String printTypeEnum = jsonObject.getString("printTypeEnum");
JSONObject data2 = jsonObject.getJSONObject("data"); JSONObject data2 = jsonObject.getJSONObject("data");
PrinterHandler.PrintTypeEnum typeEnum = PrinterHandler.PrintTypeEnum.valueOf(printTypeEnum); PrinterHandler.PrintTypeEnum typeEnum = PrinterHandler.PrintTypeEnum.valueOf(printTypeEnum);
if (typeEnum == PrinterHandler.PrintTypeEnum.HANDOVER) { if (typeEnum != PrinterHandler.PrintTypeEnum.HANDOVER) {
SysPrintData sysPrintData = new SysPrintData(); SysPrintData sysPrintData = new SysPrintData();
sysPrintData.setShopId(shopId); sysPrintData.setShopId(shopId);
sysPrintData.setData(data2.toJSONString()); sysPrintData.setData(data2.toJSONString());

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

@@ -99,6 +99,7 @@ public class HandoverRecordServiceImpl extends ServiceImpl<HandoverRecordMapper,
if (handoverRecord != null) { if (handoverRecord != null) {
data.setTurnover(NumberUtil.add(data.getTurnover(), handoverRecord.getRecharge())); data.setTurnover(NumberUtil.add(data.getTurnover(), handoverRecord.getRecharge()));
data.setRefundAmount(NumberUtil.add(data.getRefundAmount(), handoverRecord.getRefundAmount())); data.setRefundAmount(NumberUtil.add(data.getRefundAmount(), handoverRecord.getRefundAmount()));
data.setRecharge(handoverRecord.getRecharge());
} }
data.setReturnDishCount(orderInfoRpcService.countReturnDish(shopId, loginTimeStr, handoverTimeStr)); data.setReturnDishCount(orderInfoRpcService.countReturnDish(shopId, loginTimeStr, handoverTimeStr));
return data; return data;

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

@@ -164,12 +164,13 @@ public interface PrinterImpl {
.append(getFormatLabel(leftRightAlign(" 退款金额:", bigDecimalToString(handoverRecord.getRefundAmount()), 32), signLabelInfo.s)).append(signLabelInfo.br) .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(getFormatLabel(leftRightAlign(" 退菜数量:", bigDecimalToString(handoverRecord.getReturnDishCount()), 32), signLabelInfo.s)).append(signLabelInfo.br)
.append(getDividingLine()).append(signLabelInfo.br) .append(getDividingLine()).append(signLabelInfo.br)
.append(getFormatLabel(leftRightAlign("订单数量/订单总额", handoverRecord.getOrderCount() + "/" + handoverRecord.getOrderTurnover(), 32), signLabelInfo.s)).append(signLabelInfo.br) .append(getFormatLabel(leftRightAlign("订单数量/订单总额", handoverRecord.getOrderCount() + "/" + bigDecimalToString(handoverRecord.getOrderTurnover()), 32), signLabelInfo.s))
.append(getFormatLabel("----------- 销售数据 -----------", signLabelInfo.s)).append(signLabelInfo.br)
.append(getFormatLabel(key3("商品分类", "数量", "总计", 14, 8), signLabelInfo.s))
.append(signLabelInfo.br); .append(signLabelInfo.br);
if (StrUtil.isNotBlank(handoverRecord.getCategoryData())) { 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 -> { JSONArray.parseArray(handoverRecord.getCategoryData()).forEach(item -> {
JSONObject info = (JSONObject) item; JSONObject info = (JSONObject) item;
String categoryName = info.getString("categoryName"); String categoryName = info.getString("categoryName");