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:11:40 +08:00
parent f074f45f86
commit 4d61647e0d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,6 +307,12 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
.eq(TbCashierCart::getProductId, TableConstant.CART_SEAT_ID) .eq(TbCashierCart::getProductId, TableConstant.CART_SEAT_ID)
.orderByDesc(TbCashierCart::getId)); .orderByDesc(TbCashierCart::getId));
TbCashierCart cashierCart = tbCashierCarts.isEmpty() ? null : tbCashierCarts.get(0); TbCashierCart cashierCart = tbCashierCarts.isEmpty() ? null : tbCashierCarts.get(0);
Map<String, Object> map = BeanUtil.beanToMap(cashierCart, false, false);
if (cashierCart != null) {
map.put("cartId", cashierCart.getId());
TbOrderDetail orderDetail = details.stream().filter(item -> item.getCartId().equals(cashierCart.getId())).findFirst().orElse(null);
map.put("id", orderDetail != null ? orderDetail.getId() : null);
}
dto.setSeatInfo(cashierCart); dto.setSeatInfo(cashierCart);
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));