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:
SongZhang
2024-10-31 11:12:13 +08:00
parent d944a9cc82
commit f6b0055bdb
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,14 +329,8 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
.eq(TbOrderDetail::getOrderId, id) .eq(TbOrderDetail::getOrderId, id)
.eq(TbOrderDetail::getProductId, TableConstant.CART_SEAT_ID) .eq(TbOrderDetail::getProductId, TableConstant.CART_SEAT_ID)
.orderByDesc(TbOrderDetail::getId)); .orderByDesc(TbOrderDetail::getId));
TbOrderDetail cashierCart = tbCashierCarts.isEmpty() ? null : tbCashierCarts.get(0); TbOrderDetail cashierDetail = tbCashierCarts.isEmpty() ? null : tbCashierCarts.get(0);
Map<String, Object> map = BeanUtil.beanToMap(cashierCart, false, false); dto.setSeatInfo(cashierDetail);
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);
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());