diff --git a/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java b/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java index 73985f3a..ad251d90 100644 --- a/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java +++ b/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java @@ -54,8 +54,16 @@ public class PrintMqListener { } @RabbitListener(queues = {"${spring.profiles.active}-" + RabbitConstants.Queue.ORDER_MACHINE_PRINT_QUEUE}) - public void orderPrint(String orderId) { - invokeFun("orderPrint", "java.order", orderId, (data) -> printerHandler.handler(data, PrinterHandler.PrintTypeEnum.ONE_AND_ORDER)); + public void orderPrint(String req) { + invokeFun("orderPrint", "java.order", req, (data) -> { + JSONObject jsonObject = JSONObject.parseObject(data); + String orderId = jsonObject.getString("orderId"); + if (orderId == null) { + throw new RuntimeException("订单打印失败,未传递orderId"); + } + Boolean printOrder = jsonObject.getBoolean("printOrder"); + printerHandler.handler(data, printOrder != null && !printOrder ? PrinterHandler.PrintTypeEnum.ORDER : PrinterHandler.PrintTypeEnum.ONE_AND_ORDER); + }); } /** diff --git a/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java b/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java index ddaedff0..fab73e91 100644 --- a/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java +++ b/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java @@ -1,5 +1,6 @@ package com.czg.config; +import com.alibaba.fastjson2.JSONObject; import jakarta.annotation.Resource; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Value; @@ -45,10 +46,11 @@ public class RabbitPublisher { /** * 订单打印消息 * @param orderId 订单id + * @param printOrder 是否打印结算单 */ - public void sendOrderPrintMsg(String orderId) { + public void sendOrderPrintMsg(String orderId, boolean printOrder) { //厨房票 - sendMsg(RabbitConstants.Queue.ORDER_MACHINE_PRINT_QUEUE, orderId); + sendMsg(RabbitConstants.Queue.ORDER_MACHINE_PRINT_QUEUE, new JSONObject().fluentPut("orderId", orderId).fluentPut("printOrder", printOrder).toString()); //前台票 sendMsg(RabbitConstants.Queue.ORDER_PRINT_QUEUE, orderId); } 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 d65a4161..e86fabf5 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 @@ -442,7 +442,7 @@ public abstract class PrinterHandler { // 判断订单是否是先付费或者已结算 if (OrderStatusEnums.UNPAID.getCode().equals(orderInfo.getStatus()) || OrderStatusEnums.CANCELLED.getCode().equals(orderInfo.getStatus())) { log.warn("此订单未支付或已取消, 订单信息: {}", orderInfo); - return; +// return; } if (tbOrderDetailList.isEmpty()) { diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 05f422f6..8bbc7a44 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -231,7 +231,7 @@ public class OrderInfoServiceImpl extends ServiceImpl