diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java index c8fda0936..84877ec77 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java @@ -254,7 +254,6 @@ public abstract class PrinterHandler { public void refundOrderHandler(String printTitle, String operator, String refundAmount, String refundReason, String refundType, OrderInfo orderInfo, List detailList) { 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); }); } @@ -648,10 +647,6 @@ public abstract class PrinterHandler { 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, OrderInfo orderInfo, PrintMachine machine, List detailList) { @@ -663,7 +658,7 @@ public abstract class PrinterHandler { .setReturn(true) .setPrintTitle(printTitle); 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.setRefundReason(refundReason); printInfoDTO.setRefundType("cash".equals(refundType) ? "线下退款" : "原路退回"); @@ -757,7 +752,7 @@ public abstract class PrinterHandler { PrintInfoDTO printInfoDTO = new PrintInfoDTO().setShopName(shopInfo.getShopName()) .setPrintTitle(printTitle) - .setPickupNum(getTableAreaAndName(orderInfo.getShopId(), orderInfo.getTableCode(), orderInfo.getTableName())) + .setPickupNum(orderInfo.getTableName()) .setOrderNo(orderInfo.getOrderNo()).setPayAmount(orderInfo.getPayAmount().toPlainString()).setReturn(false) .setOutNumber(orderInfo.getTakeCode()).setCount(count).setRemark(orderInfo.getRemark()) // 使用累计的总优惠金额,null 表示没有优惠 diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java index a1b80ccc7..140cdfd51 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java @@ -1448,7 +1448,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { } if (table != null) { orderInfo.setTableCode(table.getTableCode()); - orderInfo.setTableName(table.getName()); + orderInfo.setTableName(shopTableService.getTableAreaAndName(shopInfo.getId(), table.getTableCode(), table.getName())); } // 餐位费 if (shopInfo.getIsTableFee().equals(0)) {