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 86e76cdcd..8d5871223 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 @@ -561,6 +561,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { if (sourceOrder == null || !sourceOrder.getStatus().equals(OrderStatusEnums.UNPAID.getCode())) { throw new CzgException("转台失败,无可转订单"); } + String sourceTableCode = sourceOrder.getTableCode(); OrderInfo targetOrder = orderInfoService.getOne(QueryWrapper.create().eq(OrderInfo::getId, param.getTargetOrderId()) .eq(OrderInfo::getTableCode, param.getTargetTableCode()) .eq(OrderInfo::getStatus, OrderStatusEnums.UNPAID.getCode())); @@ -599,7 +600,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { } } if(param.getAllMerge()==1){ - shopTableService.updateStatus(sourceOrder.getShopId(), null, sourceOrder.getTableCode(), ShopTableStatusEnum.IDLE.getValue()); + shopTableService.updateStatus(sourceOrder.getShopId(), null, sourceTableCode, ShopTableStatusEnum.IDLE.getValue()); } shopTableService.updateStatus(sourceOrder.getShopId(), null, targetOrder.getTableCode(), ShopTableStatusEnum.UNSETTLED.getValue()); return CzgResult.success();