diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java index 4ccaded6..67fbd8ec 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java @@ -295,7 +295,10 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { dto.setRefundAmount(tbOrderInfos.stream().map(TbOrderInfo::getOrderAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); } dto.setDetailList(details); - TbCashierCart cashierCart = tbCashierCartMapper.selectOne(new LambdaQueryWrapper().eq(TbCashierCart::getOrderId, id).eq(TbCashierCart::getProductId, TableConstant.CART_SEAT_ID)); + TbCashierCart cashierCart = tbCashierCartMapper.selectOne(new LambdaQueryWrapper() + .eq(TbCashierCart::getOrderId, id) + .eq(TbCashierCart::getUseType, tbOrderInfo.getUseType()) + .eq(TbCashierCart::getProductId, TableConstant.CART_SEAT_ID)); dto.setSeatInfo(cashierCart); Map data = BeanUtil.beanToMap(tbOrderInfo, false, false); data.putAll(BeanUtil.beanToMap(dto, false, false));