diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index 40114c7..b3bad0f 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -51,7 +51,7 @@ public class OrderController extends BaseController { */ @ApiOperation(value = "获取订单详情") @GetMapping("/getOrderDetails") - public TableDataInfo getOrderDetails(OrderInfoDto orderInfoDto) { + public TableDataInfo getOrderDetails(OrderInfoDto orderInfoDto) throws Exception { startPage(); return getDataTable(orderService.getOrderDetails(orderInfoDto)); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java index 365478a..258fec2 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java @@ -13,7 +13,7 @@ public interface OrderService { Integer submitOrderInfo(OrderInfoDto orderInfoDto); - List getOrderDetails(OrderInfoDto orderInfoDto); + List getOrderDetails(OrderInfoDto orderInfoDto) throws Exception; OrderInfoDto getOrderDetailsById(OrderDetailDto dto); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 7550f4c..8e605e0 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -64,24 +64,24 @@ public class OrderServiceImpl implements OrderService { } @Override - public List getOrderDetails(OrderInfoDto orderInfoDto) { + public List getOrderDetails(OrderInfoDto orderInfoDto) throws Exception { List orderInfoDtos = orderMapper.getOrderDetails(orderInfoDto); for (OrderInfoDto dto : orderInfoDtos) { List list = new ArrayList(); String ids = dto.getIds(); for (String id : ids.split(",")) { OrderDetailDto orderDetailDto = orderMapper.selectOrderDetailsById(id); - // 待出库 - if ("2".equals(orderDetailDto.getOrderStatus())) { - dto.setOrderStatus("2"); - } - // 待收货 - if ("3".equals(orderDetailDto.getOrderStatus())) { - dto.setCzOrderStatus("3"); - } list.add(orderDetailDto); } dto.setDetailsList(list); + boolean orderStatus = list.stream() + .map(OrderDetailDto::getOrderStatus) + .allMatch(name -> name.equals(list.get(0).getOrderStatus())); + if (orderStatus) { + dto.setOrderStatus(list.get(0).getOrderStatus()); + } else { + throw new Exception("订单状态不一致,请检查订单状态"); + } } return orderInfoDtos; }