Merge branch 'feature_mvp616_wangl' into 'develop'

修改

See merge request !91

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

@@ -9,7 +9,6 @@ import com.alibaba.cloud.integration.order.entity.*;
 import com.alibaba.cloud.integration.order.service.DispatchService;
 import com.alibaba.cloud.integration.order.service.DispatchService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import org.aspectj.weaver.ast.Or;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,7 +28,6 @@ interface GroupTag {
 
 
 @Service
 @Service
 public class DispatchServiceImpl implements DispatchService {
 public class DispatchServiceImpl implements DispatchService {
-
 	@Autowired
 	@Autowired
 	private OrderRequestMPDao orderRequestMPDao;
 	private OrderRequestMPDao orderRequestMPDao;
 
 
@@ -221,6 +219,9 @@ public class DispatchServiceImpl implements DispatchService {
 		// TODO,临时处理方案，后续调用派单引擎处理
 		// TODO,临时处理方案，后续调用派单引擎处理
 		OrderRequestScheduler scheduler = new OrderRequestScheduler();
 		OrderRequestScheduler scheduler = new OrderRequestScheduler();
 		List<LineSegment> results = scheduler.scheduler(orders, orderAppointments);
 		List<LineSegment> results = scheduler.scheduler(orders, orderAppointments);
+
+		System.out.println(results);
+
 		for (LineSegment r : results) {
 		for (LineSegment r : results) {
 
 
 			String orderId = r.id;
 			String orderId = r.id;
@@ -249,8 +250,7 @@ public class DispatchServiceImpl implements DispatchService {
 			wrapper.eq(OrderRequest::getOrderId, orderId);
 			wrapper.eq(OrderRequest::getOrderId, orderId);
 			orderRequestMPDao.update(null, wrapper);
 			orderRequestMPDao.update(null, wrapper);
 		}
 		}
-
-		return null;
+		return Result.success(null);
 	}
 	}
 
 
 	private List<OrderRequest> queryOrderRequests(String levelType, List<String> levelIds, String date) {
 	private List<OrderRequest> queryOrderRequests(String levelType, List<String> levelIds, String date) {