|
@@ -154,10 +154,10 @@ public class HyOrderTravelPathServiceImpl extends ServiceImpl<HyOrderTravelPathM
|
|
|
.eq("delete_flag", "0"));
|
|
|
//装车时间
|
|
|
String startDate = f.format(hyCarrierInfo.getLoadingDate());
|
|
|
- //发货地经纬度
|
|
|
- String startLonlat = publishTaskInfo.getSendLongitude() + "," + publishTaskInfo.getSendLatitude();
|
|
|
- //收货地经纬度
|
|
|
- String endLonlat = publishTaskInfo.getUnsendLongitude() + "," + publishTaskInfo.getUnsendLatitude();
|
|
|
+// //发货地经纬度
|
|
|
+// String startLonlat = publishTaskInfo.getSendLongitude() + "," + publishTaskInfo.getSendLatitude();
|
|
|
+// //收货地经纬度
|
|
|
+// String endLonlat = publishTaskInfo.getUnsendLongitude() + "," + publishTaskInfo.getUnsendLatitude();
|
|
|
//订单确认卸车之后
|
|
|
Double skey = Double.valueOf(orderInfo1.getOrderStatusKey());
|
|
|
|
|
@@ -179,8 +179,8 @@ public class HyOrderTravelPathServiceImpl extends ServiceImpl<HyOrderTravelPathM
|
|
|
map.put("vco", "1");
|
|
|
}
|
|
|
map.put("qryBtm", startDate);
|
|
|
- map.put("startLonlat", startLonlat);
|
|
|
- map.put("endLonlat", endLonlat);
|
|
|
+ map.put("startAreaCode", publishTaskInfo.getSendAdCode());
|
|
|
+ map.put("endAreaCode", publishTaskInfo.getUnsendAdCode());
|
|
|
if (skey >= 15) {
|
|
|
//查询订单轨迹表有没有北斗轨迹
|
|
|
HyOrderTravelPath hyOrderTravelPath1 = this.selectOne(new EntityWrapper<HyOrderTravelPath>()
|