Merge branch 'holiday-price' of...

Merge branch 'holiday-price' of http://113.105.137.151:22280/youjj/cloud-platform into holiday-price

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/WaterMQHandler.java

@@ -76,7 +76,8 @@ public class WaterMQHandler {
                         case RENT_VEHICLE:
                             //租车订单finlish不处理，退还第一部分押金后再处理
                             if(orderMQDTO.getSign().equals(ORDER_FINISH)) {
-                                break;
+                                //直接结束
+                                return;
                             }
                             orderMQDTO.getItemByTypeEnum(ItemTypeEnum.VEHICLE_MODEL);
                             orderWaterDTO.setGoodsDTOList(