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

fix: 订单详情返回客座费信息

This commit is contained in:
SongZhang 2024-10-30 18:28:41 +08:00
parent b363044282
commit 1017b69a89
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,12 +325,11 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
// dto.setRefundAmount(tbOrderInfos.stream().map(TbOrderInfo::getOrderAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); // dto.setRefundAmount(tbOrderInfos.stream().map(TbOrderInfo::getOrderAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
// } // }
dto.setDetailList(details); dto.setDetailList(details);
List<TbCashierCart> tbCashierCarts = tbCashierCartMapper.selectList(new LambdaQueryWrapper<TbCashierCart>() List<TbOrderDetail> tbCashierCarts = tbOrderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>()
.eq(TbCashierCart::getOrderId, id) .eq(TbOrderDetail::getOrderId, id)
.eq(TbCashierCart::getUseType, tbOrderInfo.getUseType()) .eq(TbOrderDetail::getProductId, TableConstant.CART_SEAT_ID)
.eq(TbCashierCart::getProductId, TableConstant.CART_SEAT_ID) .orderByDesc(TbOrderDetail::getId));
.orderByDesc(TbCashierCart::getId)); TbOrderDetail cashierCart = tbCashierCarts.isEmpty() ? null : tbCashierCarts.get(0);
TbCashierCart cashierCart = tbCashierCarts.isEmpty() ? null : tbCashierCarts.get(0);
Map<String, Object> map = BeanUtil.beanToMap(cashierCart, false, false); Map<String, Object> map = BeanUtil.beanToMap(cashierCart, false, false);
if (cashierCart != null) { if (cashierCart != null) {
map.put("cartId", cashierCart.getId()); map.put("cartId", cashierCart.getId());