Merge branch 'feature_OrderServiceList_wangl' into 'develop'

修改

See merge request !15

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

 package com.alibaba.cloud.integration.order.controller;
 
+import com.alibaba.cloud.integration.common.BusinessException;
 import com.alibaba.cloud.integration.common.Result;
+import com.alibaba.cloud.integration.order.service.OrderAssign;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -10,19 +13,31 @@ import org.springframework.web.bind.annotation.RequestParam;
 @Controller
 public class OrderAssignController {
 
+	@Autowired
+	private OrderAssign orderAssign;
+
 	@GetMapping("/order/assign/recommend/engineers")
-	public Result<?> getOrderAssignRecommendEnginners(@RequestParam String orderId,
-													  @RequestParam String key,
-													  @RequestParam String distance,
-													  @RequestParam String recommend) {
+	public Result<?> getOrderAssignRecommendEnginners(@RequestParam String orderId, @RequestParam String key, @RequestParam String distance, @RequestParam String recommend) {
 		//服务单指派-推荐技术员列表
-		return null;
+
+		Result<?> res = null;
+		try {
+			res = orderAssign.getOrderAssignRecommendEngineers(orderId, key, distance, recommend);
+		}catch (BusinessException e) {
+			return Result.failed(e.getMessage());
+		}
+		return res;
 	}
 
 	@PostMapping("/order/assign")
 	public Result<?> orderAssign(@RequestBody String orderId, @RequestBody String engineerCode) {
 		// 服务单指派-指派提交
-		return null;
+		Result<?> res = null;
+		try {
+			res = orderAssign.orderAssign(orderId, engineerCode);
+		}catch (BusinessException e) {
+			return Result.failed(e.getMessage());
+		}
+		return res;
 	}
-
 }

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/OrderAssignImpl.java

@@ -9,11 +9,13 @@ public class OrderAssignImpl implements OrderAssign {
 
 	@Override
 	public Result<?> getOrderAssignRecommendEngineers(String orderId, String key, String distance, String recommend) {
+		// 服务单指派-推荐技术员列表
 		return null;
 	}
 
 	@Override
 	public Result<?> orderAssign(String orderId, String engineerCode) {
+		// 服务单指派-指派提交
 		return null;
 	}
 }
\ No newline at end of file