diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index 5705443e..14a8687d 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -927,11 +927,17 @@ public class TbShopTableServiceImpl implements TbShopTableService { TbOrderInfo orderInfo = mpOrderInfoService.getOne(new LambdaQueryWrapper() .eq(TbOrderInfo::getId, cashierCart.getOrderId())); - if (TableConstant.OrderInfo.UseType.DINE_IN_AFTER.equalsVals(orderInfo.getUseType()) && StrUtil.isNotBlank(orderInfo.getTableId())) { + if (TableConstant.OrderInfo.UseType.DINE_IN_AFTER.equalsVals(orderInfo.getUseType())) { + ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(orderInfo.getShopId(), orderInfo.getTableId()); + List cashierCarts = mpCashierCartService.selectByShopEatTypeAndOrderId(shopEatTypeInfoDTO, orderInfo.getMasterId(), orderInfo.getId(), false, TableConstant.OrderInfo.Status.CREATE); + BigDecimal totalNum = BigDecimal.ZERO; + for (TbCashierCart item : cashierCarts) { + totalNum = totalNum.add(item.getTotalNumber()); + } mpShopTableService.update(new LambdaUpdateWrapper() .eq(TbShopTable::getQrcode, orderInfo.getTableId()) .eq(TbShopTable::getShopId, orderInfo.getShopId()) - .set(TbShopTable::getProductNum, mpCashierCartService.countByTableId(Integer.valueOf(orderInfo.getShopId()), orderInfo.getTableId(), OrderStatusEnums.CREATE)) + .set(TbShopTable::getProductNum, totalNum) .set(TbShopTable::getTotalAmount, orderInfo.getOrderAmount()) .set(TbShopTable::getRealAmount, orderInfo.getOrderAmount())); }