czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单创建失败不打印菜品票

Browse Source
This commit is contained in:
SongZhang
2024-10-12 10:46:19 +08:00
parent 7379b1d85d
commit 90505fd354
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -1038,6 +1038,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
@Override @Override
@Transactional
public TbOrderInfo createOrder(CreateOrderDTO createOrderDTO, boolean addMaterId, boolean isPrint) { public TbOrderInfo createOrder(CreateOrderDTO createOrderDTO, boolean addMaterId, boolean isPrint) {
createOrderDTO.setTableId(OrderUseTypeEnum.TAKEOUT.getValue().equals(createOrderDTO.getUseType()) ? null : createOrderDTO.getTableId()); createOrderDTO.setTableId(OrderUseTypeEnum.TAKEOUT.getValue().equals(createOrderDTO.getUseType()) ? null : createOrderDTO.getTableId());
return Utils.runFunAndCheckKey(() -> { return Utils.runFunAndCheckKey(() -> {
@@ -1264,18 +1265,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
mpOrderDetailService.saveOrUpdateBatch(orderDetails); mpOrderDetailService.saveOrUpdateBatch(orderDetails);
} }
if (!addOrderDetails.isEmpty() && shopEatTypeInfoDTO.isDineInAfter()) {
rabbitMsgUtils.printDishesTicket(orderInfo.getId(), false, addOrderDetails.toArray(new TbOrderDetail[0]));
}
if (!removeOrderDetailIds.isEmpty()) {
// 退单票
orderDetailMapper.deleteBatchIds(removeOrderDetailIds);
if (shopEatTypeInfoDTO.isDineInAfter()) {
rabbitMsgUtils.printDishesTicket(orderInfo.getId(), true, removeOrderDetailList.toArray(new TbOrderDetail[0]));
}
}
// 更新购物车记录的orderId // 更新购物车记录的orderId
for (TbCashierCart cashierCart : cashierCarts) { for (TbCashierCart cashierCart : cashierCarts) {
if (!"-999".equals(cashierCart.getProductId())) { if (!"-999".equals(cashierCart.getProductId())) {
@@ -1302,6 +1291,19 @@ public class TbShopTableServiceImpl implements TbShopTableService {
cashierCartMapper.updateById(cashierCart); cashierCartMapper.updateById(cashierCart);
} }
// 菜品票
if (!addOrderDetails.isEmpty() && shopEatTypeInfoDTO.isDineInAfter()) {
rabbitMsgUtils.printDishesTicket(orderInfo.getId(), false, addOrderDetails.toArray(new TbOrderDetail[0]));
}
if (!removeOrderDetailIds.isEmpty()) {
// 退单票
orderDetailMapper.deleteBatchIds(removeOrderDetailIds);
if (shopEatTypeInfoDTO.isDineInAfter()) {
rabbitMsgUtils.printDishesTicket(orderInfo.getId(), true, removeOrderDetailList.toArray(new TbOrderDetail[0]));
}
}
if (isFirst) { if (isFirst) {
// 后付费，不增加当前台桌取餐号 // 后付费，不增加当前台桌取餐号
if (!shopEatTypeInfoDTO.isTakeout()) { if (!shopEatTypeInfoDTO.isTakeout()) {