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-07 11:07:45 +08:00
parent 06fa5b4f0d
commit bf8be19afd
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java
View File

@@ -254,7 +254,6 @@ public abstract class PrinterHandler {
public void refundOrderHandler(String printTitle, String operator, String refundAmount, String refundReason, String refundType, public void refundOrderHandler(String printTitle, String operator, String refundAmount, String refundReason, String refundType,
OrderInfo orderInfo, List<OrderDetail> detailList) { OrderInfo orderInfo, List<OrderDetail> detailList) {
getPrintMachine(orderInfo.getShopId(), "cash", "normal", "").forEach(machine -> { getPrintMachine(orderInfo.getShopId(), "cash", "normal", "").forEach(machine -> {
orderInfo.setTableName(getTableAreaAndName(orderInfo.getShopId(), orderInfo.getTableCode(), orderInfo.getTableName()));
refundHandleRequest(machine, printTitle, operator, refundAmount, refundReason, refundType, orderInfo, detailList); refundHandleRequest(machine, printTitle, operator, refundAmount, refundReason, refundType, orderInfo, detailList);
}); });
} }
@@ -648,10 +647,6 @@ public abstract class PrinterHandler {
return StrUtil.isBlank(orderInfo.getTableName()) ? orderInfo.getTakeCode() : orderInfo.getTableName(); return StrUtil.isBlank(orderInfo.getTableName()) ? orderInfo.getTakeCode() : orderInfo.getTableName();
} }
public String getTableAreaAndName(Long shopId, String tableCode, String tableName) {
return shopTableService.getTableAreaAndName(shopId, tableCode, tableName);
}
public PrintInfoDTO returnOrderPrint(String printTitle, String operator, String refundAmount, String refundReason, String refundType, public PrintInfoDTO returnOrderPrint(String printTitle, String operator, String refundAmount, String refundReason, String refundType,
OrderInfo orderInfo, PrintMachine machine, List<OrderDetail> detailList) { OrderInfo orderInfo, PrintMachine machine, List<OrderDetail> detailList) {
@@ -663,7 +658,7 @@ public abstract class PrinterHandler {
.setReturn(true) .setReturn(true)
.setPrintTitle(printTitle); .setPrintTitle(printTitle);
printInfoDTO.setSeatNum(orderInfo.getSeatNum() == null ? "" : orderInfo.getSeatNum().toString()); printInfoDTO.setSeatNum(orderInfo.getSeatNum() == null ? "" : orderInfo.getSeatNum().toString());
printInfoDTO.setPickupNum(getTableAreaAndName(orderInfo.getShopId(), orderInfo.getTableCode(), orderInfo.getTableName())); printInfoDTO.setPickupNum(orderInfo.getTableName());
printInfoDTO.setRefundAmount(refundAmount); printInfoDTO.setRefundAmount(refundAmount);
printInfoDTO.setRefundReason(refundReason); printInfoDTO.setRefundReason(refundReason);
printInfoDTO.setRefundType("cash".equals(refundType) ? "线下退款" : "原路退回"); printInfoDTO.setRefundType("cash".equals(refundType) ? "线下退款" : "原路退回");
@@ -757,7 +752,7 @@ public abstract class PrinterHandler {
PrintInfoDTO printInfoDTO = new PrintInfoDTO().setShopName(shopInfo.getShopName()) PrintInfoDTO printInfoDTO = new PrintInfoDTO().setShopName(shopInfo.getShopName())
.setPrintTitle(printTitle) .setPrintTitle(printTitle)
.setPickupNum(getTableAreaAndName(orderInfo.getShopId(), orderInfo.getTableCode(), orderInfo.getTableName())) .setPickupNum(orderInfo.getTableName())
.setOrderNo(orderInfo.getOrderNo()).setPayAmount(orderInfo.getPayAmount().toPlainString()).setReturn(false) .setOrderNo(orderInfo.getOrderNo()).setPayAmount(orderInfo.getPayAmount().toPlainString()).setReturn(false)
.setOutNumber(orderInfo.getTakeCode()).setCount(count).setRemark(orderInfo.getRemark()) .setOutNumber(orderInfo.getTakeCode()).setCount(count).setRemark(orderInfo.getRemark())
// 使用累计的总优惠金额，null 表示没有优惠 // 使用累计的总优惠金额，null 表示没有优惠

2
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
View File

@@ -1448,7 +1448,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
} }
if (table != null) { if (table != null) {
orderInfo.setTableCode(table.getTableCode()); orderInfo.setTableCode(table.getTableCode());
orderInfo.setTableName(table.getName()); orderInfo.setTableName(shopTableService.getTableAreaAndName(shopInfo.getId(), table.getTableCode(), table.getName()));
} }
// 餐位费 // 餐位费
if (shopInfo.getIsTableFee().equals(0)) { if (shopInfo.getIsTableFee().equals(0)) {