订单查询修改
This commit is contained in:
@@ -295,7 +295,10 @@ 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>().eq(TbCashierCart::getOrderId, id).eq(TbCashierCart::getProductId, TableConstant.CART_SEAT_ID));
|
TbCashierCart cashierCart = tbCashierCartMapper.selectOne(new LambdaQueryWrapper<TbCashierCart>()
|
||||||
|
.eq(TbCashierCart::getOrderId, id)
|
||||||
|
.eq(TbCashierCart::getUseType, tbOrderInfo.getUseType())
|
||||||
|
.eq(TbCashierCart::getProductId, TableConstant.CART_SEAT_ID));
|
||||||
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));
|
||||||
|
|||||||
Reference in New Issue
Block a user