是否打印

This commit is contained in:
wangw 2025-04-01 16:41:35 +08:00
parent d5b05341e3
commit fa662d3d7a
2 changed files with 6 additions and 2 deletions

View File

@ -55,7 +55,9 @@ public class RabbitPublisher {
//厨房票 //厨房票
sendMsg(RabbitConstants.Queue.ORDER_MACHINE_PRINT_QUEUE, new JSONObject().fluentPut("orderId", orderId).fluentPut("printOrder", printOrder).toString()); sendMsg(RabbitConstants.Queue.ORDER_MACHINE_PRINT_QUEUE, new JSONObject().fluentPut("orderId", orderId).fluentPut("printOrder", printOrder).toString());
//前台票 //前台票
sendMsg(RabbitConstants.Queue.ORDER_PRINT_QUEUE, orderId); if (printOrder) {
sendMsg(RabbitConstants.Queue.ORDER_PRINT_QUEUE, orderId);
}
} }
/** /**

View File

@ -32,6 +32,7 @@ import com.czg.order.service.OrderInfoService;
import com.czg.order.service.OrderPaymentService; import com.czg.order.service.OrderPaymentService;
import com.czg.order.vo.*; import com.czg.order.vo.*;
import com.czg.resp.CzgResult; import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.czg.service.RedisService; import com.czg.service.RedisService;
import com.czg.service.order.enums.OrderStatusEnums; import com.czg.service.order.enums.OrderStatusEnums;
import com.czg.service.order.mapper.OrderInfoMapper; import com.czg.service.order.mapper.OrderInfoMapper;
@ -165,7 +166,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
.eq(OrderInfo::getTradeDay, historyOrderVo.getTradeDay()) .eq(OrderInfo::getTradeDay, historyOrderVo.getTradeDay())
.eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()) .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
.eq(OrderInfo::getShopId, historyOrderVo.getShopId()) .eq(OrderInfo::getShopId, historyOrderVo.getShopId())
.le(OrderInfo::getCreateTime,historyOrderVo.getCreateTime()).count(); .le(OrderInfo::getCreateTime, historyOrderVo.getCreateTime()).count();
historyOrderVo.setOrderNum(count); historyOrderVo.setOrderNum(count);
return CzgResult.success(historyOrderVo); return CzgResult.success(historyOrderVo);
} }
@ -179,6 +180,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
if (orderId == null) { if (orderId == null) {
historyOrderVo = queryChain() historyOrderVo = queryChain()
.select() .select()
.eq(OrderInfo::getShopId, StpKit.USER.getShopId())
.eq(OrderInfo::getTableCode, tableCode) .eq(OrderInfo::getTableCode, tableCode)
.eq(OrderInfo::getStatus, OrderStatusEnums.UNPAID.getCode()) .eq(OrderInfo::getStatus, OrderStatusEnums.UNPAID.getCode())
.gt(OrderInfo::getCreateTime, DateUtil.offsetDay(new Date(), -1)) .gt(OrderInfo::getCreateTime, DateUtil.offsetDay(new Date(), -1))