Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
11a9323471
|
|
@ -81,13 +81,29 @@ public class OrderInfoServiceImpl implements IOrderInfoService
|
|||
@Override
|
||||
public OrderInfo selectOrderInfoByOrderId(Long orderId)
|
||||
{
|
||||
return orderInfoMapper.selectOrderInfoByOrderId(orderId);
|
||||
OrderInfo orderInfo = orderInfoMapper.selectOrderInfoByOrderId(orderId);
|
||||
if(Objects.isNull(orderInfo)) {
|
||||
throw new ServiceException("订单不存在");
|
||||
}
|
||||
OrderDetail orderDetail = new OrderDetail();
|
||||
orderDetail.setOrderId(orderId);
|
||||
List<OrderDetail> orderDetailList = orderDetailService.selectOrderDetailList(orderDetail);
|
||||
orderInfo.setOrderDetailList(orderDetailList);
|
||||
return orderInfo;
|
||||
}
|
||||
|
||||
@Override
|
||||
public OrderInfo selectOrderInfoBydeviceOrderId(String deviceOrderId)
|
||||
{
|
||||
return orderInfoMapper.selectOrderInfoByDeviceOrderId(deviceOrderId);
|
||||
OrderInfo orderInfo = orderInfoMapper.selectOrderInfoByDeviceOrderId(deviceOrderId);
|
||||
if(Objects.isNull(orderInfo)) {
|
||||
throw new ServiceException("订单不存在");
|
||||
}
|
||||
OrderDetail orderDetail = new OrderDetail();
|
||||
orderDetail.setOrderId(orderInfo.getOrderId());
|
||||
List<OrderDetail> orderDetailList = orderDetailService.selectOrderDetailList(orderDetail);
|
||||
orderInfo.setOrderDetailList(orderDetailList);
|
||||
return orderInfo;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue