Merge branch 'dev_engineer_dynamics0728' into 'develop'

修改

See merge request !300

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerTimelineServiceImpl.java

@@ -27,9 +27,6 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 	private EngineerInfoMPDao engineerInfoMPDao;
 	private EngineerInfoMPDao engineerInfoMPDao;
 
 
 	@Autowired
 	@Autowired
-	private OrderRequestMPDao orderRequestMPDao;
-
-	@Autowired
 	private WarehouseInfoMPDao warehouseInfoMPDao;
 	private WarehouseInfoMPDao warehouseInfoMPDao;
 
 
 	@Autowired
 	@Autowired
@@ -55,7 +52,7 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 		List<OrderEvent> timelines = this.engineerTimelines(orderIds, date);
 		List<OrderEvent> timelines = this.engineerTimelines(orderIds, date);
 
 
 		// 获取客户地址
 		// 获取客户地址
-		HashMap<String, String> orderLocations = this.orderRequestsLocation(orderIds);
+		HashMap<String, String> orderLocations = this.orderRequestsLocation(orders);
 
 
 		// 获取配送站地址
 		// 获取配送站地址
 		String branchId = this.getEngineerBranchId(engineerCode);
 		String branchId = this.getEngineerBranchId(engineerCode);
@@ -90,13 +87,10 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
 		return orderEventMPDao.selectList(lqw);
 		return orderEventMPDao.selectList(lqw);
 	}
 	}
 
 
-	private HashMap<String, String> orderRequestsLocation(List<String> orderIds) {
+	private HashMap<String, String> orderRequestsLocation(List<OrderInfo> orders) {
 		// 获取客户地址location
 		// 获取客户地址location
 		HashMap<String, String> map = new HashMap<>();
 		HashMap<String, String> map = new HashMap<>();
-		LambdaQueryWrapper<OrderRequest> lqw = new LambdaQueryWrapper<>();
-		lqw.in(OrderRequest::getOrderId, orderIds);
-		List<OrderRequest> orders = orderRequestMPDao.selectList(lqw);
-		for(OrderRequest o: orders){
+		for(OrderInfo o: orders){
 			map.put(o.getOrderId(), String.format("%s,%s", o.getX(), o.getY()));
 			map.put(o.getOrderId(), String.format("%s,%s", o.getX(), o.getY()));
 		}
 		}
 		return map;
 		return map;