czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 订单列表返回字段修改

Browse Source
This commit is contained in:
张松
2024-11-11 16:59:53 +08:00
parent 68261e6185
commit 06d92f7e26
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
View File

@@ -171,7 +171,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
shopInfoMap.put(item.getId().toString(), item); shopInfoMap.put(item.getId().toString(), item);
}); });
} }
List<TbOrderInfoVo> orderInfoVoList = new ArrayList<>(); List<Object> orderInfoVoList = new ArrayList<>();
for (TbOrderInfo tbOrderInfo : page.getContent()) { for (TbOrderInfo tbOrderInfo : page.getContent()) {
TbOrderInfoVo orderInfoVo = new TbOrderInfoVo(); TbOrderInfoVo orderInfoVo = new TbOrderInfoVo();
BigDecimal refundAmount = BigDecimal.ZERO; BigDecimal refundAmount = BigDecimal.ZERO;
@@ -211,13 +211,15 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
orderInfoVo.setTableName(tbOrderInfo.getTableName()); orderInfoVo.setTableName(tbOrderInfo.getTableName());
orderInfoVo.setDetailList(detailList); orderInfoVo.setDetailList(detailList);
orderInfoVo.setSeatInfo(seatInfo); orderInfoVo.setSeatInfo(seatInfo);
BeanUtils.copyProperties(tbOrderInfo, orderInfoVo);
orderInfoVo.setRefundAmount(refundAmount); orderInfoVo.setRefundAmount(refundAmount);
TbShopInfo shopInfo = shopInfoMap.get(tbOrderInfo.getShopId()); TbShopInfo shopInfo = shopInfoMap.get(tbOrderInfo.getShopId());
if (shopInfo != null) { if (shopInfo != null) {
orderInfoVo.setRegisterType(shopInfo.getRegisterType()); orderInfoVo.setRegisterType(shopInfo.getRegisterType());
} }
orderInfoVoList.add(orderInfoVo); Map<String, Object> map = BeanUtil.beanToMap(tbOrderInfo, false, false);
Map<String, Object> objectMap = BeanUtil.beanToMap(orderInfoVo, false, false);
objectMap.putAll(map);
orderInfoVoList.add(objectMap);
} }
return PageUtil.toPage(orderInfoVoList, page.getTotalElements()); return PageUtil.toPage(orderInfoVoList, page.getTotalElements());
} }