diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java index 0d86fa041..413011e81 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java @@ -292,6 +292,10 @@ public class ShopInfoEditDTO { * 数签子 */ private Integer isCountStick; + /** + * 后厨单菜二维码 + */ + private Integer isKitchenCode; /** * 退菜退库存模式 1跟随商品分类 2 跟随单商品 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java index a4adee0fd..68ba78dc0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java @@ -135,6 +135,10 @@ public class ShopConfig implements Serializable { * 数签子 */ private Integer isCountStick; + /** + * 后厨单菜二维码 + */ + private Integer isKitchenCode; /** * 退菜退库存模式 1跟随商品分类 2 跟随单商品 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java index 930c13c42..bcbb3e086 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java @@ -361,6 +361,11 @@ public class ShopInfo implements Serializable { */ @Column(ignore = true) private Integer isCountStick; + /** + * 后厨单菜二维码 + */ + @Column(ignore = true) + private Integer isKitchenCode; /** * 退菜退库存模式 1跟随商品分类 2 跟随单商品 */ diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java index 788a93bf1..d6106bb05 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java @@ -60,8 +60,8 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl { } @Override - protected void onlyKitchenPrint(OrderInfo orderInfo, OrderDetail orderDetail, PrintMachine machine) { - String buildDishPrintData = buildOnlyKitchenPrintData(getPickupNum(orderInfo), orderDetail); + protected void onlyKitchenPrint(Integer isCode, OrderInfo orderInfo, OrderDetail orderDetail, PrintMachine machine) { + String buildDishPrintData = buildOnlyKitchenPrintData(isCode, getPickupNum(orderInfo), orderDetail); String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}"; if (1 == machine.getVolumeSwitch()) { voiceJson = "{\"bizType\":\"2\",\"content\":\"新单来了,请注意查看\"}"; diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrintConfig.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrintConfig.java index 4c72b4306..1997b018f 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrintConfig.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrintConfig.java @@ -155,7 +155,8 @@ public class PrintConfig implements ApplicationRunner { machine.setVolumeSwitch(0); } isNotice = false; - FunUtils.safeRunVoid(() -> printer.onlyKitchenPrint(orderInfo, item, machine), + ShopInfo shopInfo = shopInfoService.getById(orderInfo.getShopId()); + FunUtils.safeRunVoid(() -> printer.onlyKitchenPrint(shopInfo.getIsKitchenCode(), orderInfo, item, machine), "订单id:{} ,后厨分单打印失败", orderInfo.getId()); // 保存已打印信息 redisService.set(RedisCst.kitchenOnly(orderInfo.getId(), machine.getId(), item.getId()), "", 20); 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 28a8503bd..9cca2fdba 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 @@ -337,7 +337,7 @@ public abstract class PrinterHandler { /** * 后厨 菜品打印 */ - protected abstract void onlyKitchenPrint(OrderInfo orderInfo, OrderDetail orderDetail, PrintMachine machine); + protected abstract void onlyKitchenPrint(Integer isCode, OrderInfo orderInfo, OrderDetail orderDetail, PrintMachine machine); /** * 后厨 退菜整单打印 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 d9b9b91d5..8fbb92959 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 @@ -468,7 +468,7 @@ public interface PrinterImpl { * @param pickupNumber 取餐号 * @return 元数据 */ - default String buildOnlyKitchenPrintData(String pickupNumber, OrderDetail orderDetail) { + default String buildOnlyKitchenPrintData(Integer isCode, String pickupNumber, OrderDetail orderDetail) { PrintSignLabel signLabelInfo = getSignLabelInfo(); StringBuilder builder = new StringBuilder(); builder.append(formatLabel(pickupNumber, signLabelInfo.centerBold)) @@ -527,6 +527,10 @@ public interface PrinterImpl { builder.append(formatLabel("【加急】", signLabelInfo.center, signLabelInfo.bold)) .append(signLabelInfo.br); } + if (1 == isCode) { + builder.append(formatLabel("UP_ORDER_DETAIL:" + orderDetail.getId(), signLabelInfo.center, signLabelInfo.qr)) + .append(signLabelInfo.br); + } builder.append(signLabelInfo.br) .append(signLabelInfo.getOut(150)) .append(signLabelInfo.cut); diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java index 6d21db602..7924ec117 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java @@ -55,8 +55,8 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl { @Override - protected void onlyKitchenPrint(OrderInfo orderInfo, OrderDetail orderDetail, PrintMachine machine) { - String buildDishPrintData = buildOnlyKitchenPrintData(getPickupNum(orderInfo), orderDetail); + protected void onlyKitchenPrint(Integer isCode, OrderInfo orderInfo, OrderDetail orderDetail, PrintMachine machine) { + String buildDishPrintData = buildOnlyKitchenPrintData(isCode, getPickupNum(orderInfo), orderDetail); String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}"; if (1 == machine.getVolumeSwitch()) { voiceJson = "{\"bizType\":\"2\",\"content\":\"新单来了,请注意查看\"}"; @@ -253,6 +253,7 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl { /** * 签名Token + * * @param timestamp 时间戳,13位 * @param requestId 请求ID,自定义 * @return token信息