订单状态统一修改

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java

@@ -61,7 +61,7 @@ public class OrderController extends BaseController {
      */
     @ApiOperation(value = "获取单个订单详情")
     @GetMapping("/getOrderDetailsById")
-    public AjaxResult getOrderDetailsById(OrderDetailDto dto) {
+    public AjaxResult getOrderDetailsById(OrderDetailDto dto) throws Exception {
         if (dto.getOrderId() != null) {
             OrderInfoDto orderInfoDto = orderService.getOrderDetailsById(dto);
             return success(orderInfoDto);

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/OrderService.java

@@ -15,5 +15,5 @@ public interface OrderService {
 
     List<OrderInfoDto> getOrderDetails(OrderInfoDto orderInfoDto) throws Exception;
 
-    OrderInfoDto getOrderDetailsById(OrderDetailDto dto);
+    OrderInfoDto getOrderDetailsById(OrderDetailDto dto) throws Exception;
 }

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java

@@ -89,9 +89,17 @@ public class OrderServiceImpl implements OrderService {
     }
 
     @Override
-    public OrderInfoDto getOrderDetailsById(OrderDetailDto dto) {
+    public OrderInfoDto getOrderDetailsById(OrderDetailDto dto) throws Exception {
         OrderInfoDto orderInfoDto = orderMapper.getOrderDetailsById(dto);
         List<OrderDetailDto> list = orderMapper.selectOrderDetailsByOderId(dto.getOrderId().toString());
+        boolean orderStatus = list.stream()
+                .map(OrderDetailDto::getOrderStatus)
+                .allMatch(name -> name.equals(list.get(0).getOrderStatus()));
+        if (orderStatus) {
+            orderInfoDto.setOrderStatus(list.get(0).getOrderStatus());
+        } else {
+            throw new Exception("订单状态不一致，请检查订单状态");
+        }
         orderInfoDto.setStartTime(list.get(0).getRentBeginTime());
         orderInfoDto.setEndTime(list.get(0).getRentEndTime());
         orderInfoDto.setDetailsList(list);

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml

@@ -152,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mdi.person_phone AS personPhone,
             su.phonenumber AS phoneNumber,
             su.nick_name AS nickName,
+            sum(hh.costs) cost,
             moi.address,
             dept.companyName
         FROM