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 a85cc75..d584e02 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 @@ -114,6 +114,13 @@ public class OrderController extends BaseController { } } + @ApiOperation(value = "获取单个订单详情") + @GetMapping("/getOrderStatusCount") + public AjaxResult getOrderStatusCount(OrderDetailDto dto) throws Exception { + List list = orderService.getOrderStatusCount(dto); + return success(list); + } + /** * 订单状态流转修改 */ diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java index d156c95..82a4d12 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java @@ -135,4 +135,5 @@ public class OrderInfoDto { private BigDecimal totalRealPrice; + private Integer orderCount; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java index 16f9503..82ff1bf 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java @@ -26,6 +26,8 @@ public interface OrderMapper { List getOrderDetails(OrderInfoDto orderInfoDto); OrderInfoDto getOrderDetailsById(OrderDetailDto orderInfoDto); + List getOrderStatusCount(OrderDetailDto orderInfoDto); + OrderDetailDto selectOrderDetailsById(String id); void updateMaStatus(OrderDetailDto orderDetailDto); 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 c58c9c4..bbfc0f6 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 @@ -19,6 +19,8 @@ public interface OrderService { OrderInfoDto getOrderDetailsById(OrderDetailDto dto) throws Exception; + List getOrderStatusCount(OrderDetailDto dto) throws Exception; + Integer inputCostRelief(OrderInfoDto orderInfoDto); Integer changeReliefPrice(OrderInfoDto orderInfoDto); 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 ab3521b..3321581 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 @@ -191,6 +191,12 @@ public class OrderServiceImpl implements OrderService { return orderInfoDto; } + @Override + public List getOrderStatusCount(OrderDetailDto dto) throws Exception { + List orderInfoDto = orderMapper.getOrderStatusCount(dto); + return orderInfoDto; + } + @Override public Integer inputCostRelief(OrderInfoDto orderInfoDto) { int result = 0; diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index 6817d4c..9744c24 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -312,6 +312,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE mt.del_flag = 0 and hh.order_id = #{orderId} + + +