Merge branch 'feature_mvp616_wangl' into 'develop'

修改

See merge request !90

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/DispatchController.java

@@ -24,7 +24,7 @@ public class DispatchController {
 		try {
 		try {
 			res = dispatchService.getDispatchOrderList(levelType, levelIds, date, groupTagId);
 			res = dispatchService.getDispatchOrderList(levelType, levelIds, date, groupTagId);
 		}catch (BusinessException e) {
 		}catch (BusinessException e) {
-			Result.failed(e.getMessage());
+			return Result.failed(e.getMessage());
 		}
 		}
 		return res;
 		return res;
 	}
 	}
@@ -36,7 +36,7 @@ public class DispatchController {
 		try {
 		try {
 			res = dispatchService.getDispatchEngineerOrderList(levelType, levelIds, date);
 			res = dispatchService.getDispatchEngineerOrderList(levelType, levelIds, date);
 		}catch (BusinessException e) {
 		}catch (BusinessException e) {
-			Result.failed(e.getMessage());
+			return Result.failed(e.getMessage());
 		}
 		}
 		return res;
 		return res;
 	}
 	}
@@ -48,7 +48,7 @@ public class DispatchController {
 		try {
 		try {
 			res = dispatchService.dispatchOrderConfirm(req.getEngineerCode(), req.getOrderIds());
 			res = dispatchService.dispatchOrderConfirm(req.getEngineerCode(), req.getOrderIds());
 		}catch (BusinessException e){
 		}catch (BusinessException e){
-			Result.failed(e.getMessage());
+			return Result.failed(e.getMessage());
 		}
 		}
 		return res;
 		return res;
 	}
 	}

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/OrderServiceDetailController.java

@@ -24,7 +24,7 @@ public class OrderServiceDetailController {
 		try {
 		try {
 			res = orderServiceDetail.getOrderServiceDetail(orderId);
 			res = orderServiceDetail.getOrderServiceDetail(orderId);
 		} catch (BusinessException e) {
 		} catch (BusinessException e) {
-			Result.failed(e.getMessage());
+			return Result.failed(e.getMessage());
 		}
 		}
 		return res;
 		return res;
 	}
 	}
@@ -37,7 +37,7 @@ public class OrderServiceDetailController {
 		try {
 		try {
 			res = orderServiceDetail.getOrderServiceDynamics(orderId);
 			res = orderServiceDetail.getOrderServiceDynamics(orderId);
 		} catch (BusinessException e) {
 		} catch (BusinessException e) {
-			Result.failed(e.getMessage());
+			return Result.failed(e.getMessage());
 		}
 		}
 		return res;
 		return res;
 	}
 	}

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/ProductCategoryController.java

@@ -21,7 +21,7 @@ public class ProductCategoryController {
 		try {
 		try {
 			res = productCategoryService.getProductCategory();
 			res = productCategoryService.getProductCategory();
 		} catch (BusinessException e) {
 		} catch (BusinessException e) {
-			Result.failed(e.getMessage());
+			return Result.failed(e.getMessage());
 		}
 		}
 		return res;
 		return res;
 	}
 	}

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/ScheduleController.java

@@ -25,7 +25,7 @@ public class ScheduleController {
 		try{
 		try{
 			res = scheduleService.getScheduleOverview(page, size, date, levelType, levelIds);
 			res = scheduleService.getScheduleOverview(page, size, date, levelType, levelIds);
 		} catch (BusinessException e) {
 		} catch (BusinessException e) {
-			Result.failed(e.getMessage());
+			return Result.failed(e.getMessage());
 		}
 		}
 		return res;
 		return res;
 	}
 	}
@@ -36,7 +36,7 @@ public class ScheduleController {
 		try {
 		try {
 			res = scheduleService.getScheduleEngineerOverview(date, engineerCode);
 			res = scheduleService.getScheduleEngineerOverview(date, engineerCode);
 		} catch (BusinessException e) {
 		} catch (BusinessException e) {
-			Result.failed(e.getMessage());
+			return Result.failed(e.getMessage());
 		}
 		}
 		return res;
 		return res;
 	}
 	}