计次关闭运输订单

src/main/java/com/steerinfo/dil/service/impl/TmstruckTimeTaskResultServiceImpl.java

@@ -390,13 +390,18 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
             }else{
                 map.put("Time1",Time1);
             }
-            //生成计时计费详单
-            genernateInwardTime(map);
             //计算完成
             Map<String, Object> orderMes = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
             BigDecimal orderType =DataChange.dataToBigDecimal(orderMes.get("orderType"));
             if (orderType.intValue()==21) {
-                pushOrderForPause(map);
+                //生成计时计费详单
+                genernateInwardTime(map);
+                pushOrderForPause(map);//包含关闭订单并推单
+            }else if(orderType.intValue()==26){
+                //关闭运输订单
+                map.put("orderStatus", 2);
+                i = utilsMapper.updateOrderStatusByOrderIdOrNum(map);
+                //生成计次计费详单
             }
          }
             return i;