From 06d92f7e2688b1cce11a0462d990747f3cf58859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Mon, 11 Nov 2024 16:59:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/order/TbOrderInfoServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 10f0e51b..59c6f997 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 @@ -171,7 +171,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { shopInfoMap.put(item.getId().toString(), item); }); } - List orderInfoVoList = new ArrayList<>(); + List orderInfoVoList = new ArrayList<>(); for (TbOrderInfo tbOrderInfo : page.getContent()) { TbOrderInfoVo orderInfoVo = new TbOrderInfoVo(); BigDecimal refundAmount = BigDecimal.ZERO; @@ -211,13 +211,15 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { orderInfoVo.setTableName(tbOrderInfo.getTableName()); orderInfoVo.setDetailList(detailList); orderInfoVo.setSeatInfo(seatInfo); - BeanUtils.copyProperties(tbOrderInfo, orderInfoVo); orderInfoVo.setRefundAmount(refundAmount); TbShopInfo shopInfo = shopInfoMap.get(tbOrderInfo.getShopId()); if (shopInfo != null) { orderInfoVo.setRegisterType(shopInfo.getRegisterType()); } - orderInfoVoList.add(orderInfoVo); + Map map = BeanUtil.beanToMap(tbOrderInfo, false, false); + Map objectMap = BeanUtil.beanToMap(orderInfoVo, false, false); + objectMap.putAll(map); + orderInfoVoList.add(objectMap); } return PageUtil.toPage(orderInfoVoList, page.getTotalElements()); }