|
|
@@ -41,14 +41,19 @@ public class OrderServiceImpl implements OrderService {
|
|
|
order.setStatus(OrderStatusEnum.UNPAID);
|
|
|
order.setCreateTime(new Date());
|
|
|
orderRepository.save(order);
|
|
|
- return order.toVO();
|
|
|
+ return wrapWithProductId(order.toVO());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public List<OrderVO> getAllOrders() {
|
|
|
int userId=securityUtil.getCurrentUser().getId();
|
|
|
List<Order> orders = orderRepository.findByUserId(userId);
|
|
|
- return orders.stream().map(Order::toVO).collect(Collectors.toList());
|
|
|
+ return orders.stream().map(x->wrapWithProductId(x.toVO())).collect(Collectors.toList());
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public OrderVO getOrder(Integer id) {
|
|
|
+ return wrapWithProductId(orderRepository.findById(id).get().toVO());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -130,5 +135,13 @@ public class OrderServiceImpl implements OrderService {
|
|
|
storeRepository.save(store);
|
|
|
return true;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+ private OrderVO wrapWithProductId(OrderVO orderVO){
|
|
|
+ Integer productId=orderVO.getProductId();
|
|
|
+ Product product=productRepository.findById(productId).get();
|
|
|
+ orderVO.setProductName(product.getName());
|
|
|
+ orderVO.setPrice(product.getPrice());
|
|
|
+ orderVO.setStoreId(product.getStoreId());
|
|
|
+ return orderVO;
|
|
|
+ }
|
|
|
}
|