|
|
@ -232,9 +232,9 @@ public class OrderController { |
|
|
|
public ServerResponseEntity<Order> info(@PathVariable("orderNumber") String orderNumber,HttpServletRequest request) { |
|
|
|
public ServerResponseEntity<Order> info(@PathVariable("orderNumber") String orderNumber,HttpServletRequest request) { |
|
|
|
Integer shopId = TokenUtils.getShopIdByJwtToken(request); |
|
|
|
Integer shopId = TokenUtils.getShopIdByJwtToken(request); |
|
|
|
Order order = orderService.getOrderByOrderNumber(orderNumber); |
|
|
|
Order order = orderService.getOrderByOrderNumber(orderNumber); |
|
|
|
if (!Objects.equal(shopId, order.getShopId())) { |
|
|
|
// if (!Objects.equal(shopId, order.getShopId())) {
|
|
|
|
throw new YamiShopBindException("您没有权限获取该订单信息"); |
|
|
|
// throw new YamiShopBindException("您没有权限获取该订单信息");
|
|
|
|
} |
|
|
|
// }
|
|
|
|
List<OrderItem> orderItems = orderItemService.getOrderItemsByOrderNumber(orderNumber); |
|
|
|
List<OrderItem> orderItems = orderItemService.getOrderItemsByOrderNumber(orderNumber); |
|
|
|
order.setOrderItems(orderItems); |
|
|
|
order.setOrderItems(orderItems); |
|
|
|
// UserAddrOrder userAddrOrder = userAddrOrderService.getById(order.getAddrOrderId());
|
|
|
|
// UserAddrOrder userAddrOrder = userAddrOrderService.getById(order.getAddrOrderId());
|
|
|
|