|
@@ -2032,6 +2032,18 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
**/
|
|
|
public boolean getDriverConfirmation(Map<String, Object> map){
|
|
|
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;
|
|
|
}
|
|
|
|