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 8be5c359..4d250dda 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 @@ -329,14 +329,8 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { .eq(TbOrderDetail::getOrderId, id) .eq(TbOrderDetail::getProductId, TableConstant.CART_SEAT_ID) .orderByDesc(TbOrderDetail::getId)); - TbOrderDetail cashierCart = tbCashierCarts.isEmpty() ? null : tbCashierCarts.get(0); - Map map = BeanUtil.beanToMap(cashierCart, false, false); - if (cashierCart != null) { - map.put("cartId", cashierCart.getCartId()); - TbOrderDetail orderDetail = details.stream().filter(item -> item.getCartId().equals(cashierCart.getId())).findFirst().orElse(null); - map.put("id", orderDetail != null ? orderDetail.getId() : null); - } - dto.setSeatInfo(map); + TbOrderDetail cashierDetail = tbCashierCarts.isEmpty() ? null : tbCashierCarts.get(0); + dto.setSeatInfo(cashierDetail); Map data = BeanUtil.beanToMap(tbOrderInfo, false, false); data.putAll(BeanUtil.beanToMap(dto, false, false)); data.put("refundAmount", tbOrderInfo.getRefundAmount());