luobang 2 年之前
父节点
当前提交
1bf23dd446
共有 1 个文件被更改,包括 12 次插入0 次删除
  1. 12 0
      src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

+ 12 - 0
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -2032,6 +2032,18 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      **/
      **/
     public boolean getDriverConfirmation(Map<String, Object> map){
     public boolean getDriverConfirmation(Map<String, Object> map){
         Integer driverConfirmation = omstruckOrderMapper.getDriverConfirmation(DataChange.dataToBigDecimal(map.get("orderId")));
         Integer driverConfirmation = omstruckOrderMapper.getDriverConfirmation(DataChange.dataToBigDecimal(map.get("orderId")));
+        //获取当前路段顺序号与订单路段顺序号
+        Map<String, Object> seqMap = omstruckOrderMapper.getMaxLineSeqByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+        //订单当前路段顺序号
+        if(seqMap != null){
+            BigDecimal orderLineSequence = DataChange.dataToBigDecimal(seqMap.get("orderLineSequence"));
+            //路径最大路段顺序号
+            BigDecimal maxSegmentSqe = DataChange.dataToBigDecimal(seqMap.get("segmentSqe"));
+            int i = maxSegmentSqe.intValue() - orderLineSequence.intValue();
+            if(i != 1 && i != 2){
+                return false;
+            }
+        }
         return driverConfirmation == null;
         return driverConfirmation == null;
     }
     }