Skip to content

yangxiujun / paidan_demo

Go to a project
Commit f13db15d by 王力
Options

Merge branch 'dev_bugfix_dispatch' into 'develop' 

修改

See merge request !247
2 parents 0032aa65 7786f12a
Inline Side-by-side
Showing with 2 additions and 0 deletions
project-order/src/main/java/com/dituhui/pea/order/common/OrderAssignCheck.java
...@@ -188,6 +188,8 @@ public class OrderAssignCheck { ...@@ -188,6 +188,8 @@ public class OrderAssignCheck {
Pair postCurPair = this.getDistanceAndDuration(post.getX(), post.getY(), curX, curY); Pair postCurPair = this.getDistanceAndDuration(post.getX(), post.getY(), curX, curY);
Pair prePostPair = this.getDistanceAndDuration(post.getX(), post.getY(), pre.getX(), pre.getY()); Pair prePostPair = this.getDistanceAndDuration(post.getX(), post.getY(), pre.getX(), pre.getY());
log.info("pre-cur{}, post-cur:{}, pre-post:{}", preCurPair, postCurPair, prePostPair);
// 判断增加时间+距离后，时间是否重叠了 // 判断增加时间+距离后，时间是否重叠了
int distance = post.getStart() - postCurPair.getDuration() - (pre.getEnd() + preCurPair.getDuration()); int distance = post.getStart() - postCurPair.getDuration() - (pre.getEnd() + preCurPair.getDuration());
if(distance < takeTime) { if(distance < takeTime) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!