历史订单

订单列表
This commit is contained in:
2025-02-27 11:01:28 +08:00
parent 36b4467ba5
commit eda74e2609
4 changed files with 16 additions and 11 deletions

View File

@@ -135,19 +135,19 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
throw new ValidateException("订单id或台桌码不可为空");
}
HistoryOrderVo historyOrderVo = new HistoryOrderVo();
OrderInfo orderInfo;
// OrderInfo orderInfo;
if (orderId == null) {
orderInfo = queryChain()
historyOrderVo = queryChain()
.select()
.eq(OrderInfo::getTableCode, tableCode)
.one();
.eq(OrderInfo::getStatus, OrderStatusEnums.UNPAID.getCode())
.gt(OrderInfo::getCreateTime, DateUtil.offsetDay(new Date(), -1))
.oneAs(HistoryOrderVo.class);
} else {
orderInfo = getById(orderId);
historyOrderVo = getOneAs(new QueryWrapper().eq(OrderInfo::getId, orderId), HistoryOrderVo.class);
}
AssertUtil.isNull(orderInfo, "订单不存在");
historyOrderVo.setInfo(orderInfo);
List<OrderDetail> orderDetails = orderDetailService.queryChain().select()
.eq(OrderDetail::getOrderId, orderInfo.getId()).list();
.eq(OrderDetail::getOrderId, historyOrderVo.getId()).list();
Map<Integer, List<OrderDetail>> resultMap = new HashMap<>();
// 遍历订单详情列表
for (OrderDetail orderDetail : orderDetails) {