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

修改订单详情餐位费返回结构

Browse Source
This commit is contained in:
SongZhang
2024-10-23 11:12:31 +08:00
parent 4d61647e0d
commit 82f7bd890e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java
View File

@@ -173,7 +173,7 @@ public class TbOrderInfoDto implements Serializable {
private Integer seatCount; private Integer seatCount;
private BigDecimal seatAmount; private BigDecimal seatAmount;
private String useType; private String useType;
private TbCashierCart seatInfo; private Object seatInfo;
private String refundRemark; private String refundRemark;
} }

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

@@ -313,7 +313,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
TbOrderDetail orderDetail = details.stream().filter(item -> item.getCartId().equals(cashierCart.getId())).findFirst().orElse(null); TbOrderDetail orderDetail = details.stream().filter(item -> item.getCartId().equals(cashierCart.getId())).findFirst().orElse(null);
map.put("id", orderDetail != null ? orderDetail.getId() : null); map.put("id", orderDetail != null ? orderDetail.getId() : null);
} }
dto.setSeatInfo(cashierCart); dto.setSeatInfo(map);
Map<String, Object> data = BeanUtil.beanToMap(tbOrderInfo, false, false); Map<String, Object> data = BeanUtil.beanToMap(tbOrderInfo, false, false);
data.putAll(BeanUtil.beanToMap(dto, false, false)); data.putAll(BeanUtil.beanToMap(dto, false, false));
data.put("refundAmount", tbOrderInfo.getRefundAmount()); data.put("refundAmount", tbOrderInfo.getRefundAmount());