客座费获取修改
This commit is contained in:
parent
afbfde52bb
commit
5a2c3f4208
|
|
@ -295,10 +295,12 @@ 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);
|
||||||
TbCashierCart cashierCart = tbCashierCartMapper.selectOne(new LambdaQueryWrapper<TbCashierCart>()
|
List<TbCashierCart> tbCashierCarts = tbCashierCartMapper.selectList(new LambdaQueryWrapper<TbCashierCart>()
|
||||||
.eq(TbCashierCart::getOrderId, id)
|
.eq(TbCashierCart::getOrderId, id)
|
||||||
.eq(TbCashierCart::getUseType, tbOrderInfo.getUseType())
|
.eq(TbCashierCart::getUseType, tbOrderInfo.getUseType())
|
||||||
.eq(TbCashierCart::getProductId, TableConstant.CART_SEAT_ID));
|
.eq(TbCashierCart::getProductId, TableConstant.CART_SEAT_ID)
|
||||||
|
.orderByDesc(TbCashierCart::getId));
|
||||||
|
TbCashierCart cashierCart = tbCashierCarts.isEmpty() ? null : tbCashierCarts.get(0);
|
||||||
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));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue