as

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

@@ -625,15 +625,13 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
 
     @Override
     public int closeInwardOrder(Integer orderId) {
-      int i = omstruckOrderSeparateMapper.closeInwardOrder(orderId);
-        //判断是否需要重新推单
-        //根据运输订单id查找需求日期是否超过一个月
+        int i = omstruckOrderSeparateMapper.closeInwardOrder(orderId);
         Map<String, Object> map = omstruckOrderMapper.selectInwardTimeByOrderId(new BigDecimal(orderId));
-        Object dueTime = map.get("dueTime");
-        if(dueTime != null){
-            Date dueDate = (Date) dueTime;
+        //根据运输订单id查找需求日期是否超过一个月
+        if(map != null){
+            Date dueDate = (Date) map.get("dueTime");
             //当前时间小于截至日期
-            long DueTime = dueDate.getTime();
+            long DueTime = dueDate.getTime() + 86400000;
             //获取当前时间
             Date date = new Date();
             long nowTime = date.getTime();
@@ -642,7 +640,6 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
                 i += addNewTransportOrder(new BigDecimal(orderId));
             }
         }
-
-      return i;
+        return i;
     }
 }

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

@@ -8,6 +8,7 @@ import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.IOmstruckOrderService;
 import com.steerinfo.dil.util.DataChange;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -805,13 +806,18 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             if(orderStatus == 5 || orderStatus == 6) {
                 throw new RuntimeException("订单已被接收或已被拒绝!");
             }
-            BigDecimal orderType = (BigDecimal) orderMessage.get("orderType");
-            //添加各个实绩
-            if(orderType.intValue() != 11){
+            int orderType = DataChange.dataToBigDecimal(orderMessage.get("orderType")).intValue();
+            if(orderType == 11){
+                //发送计量委托
+                orderMessage.put("asd", 1);
+                orderMessage.put("orderId", orderId);
+                tmsTruckFeign.sendMeasureCommission(orderMessage);
+            }else {
+                //添加各个实绩
                 omstruckOrderSeparateService.addAllSonResult(orderMessage);
             }
             //判断订单是否是一车多单
-            if (orderType.intValue()==15 || orderType.intValue()==16 || orderType.intValue()==19) {
+            if (orderType ==15 || orderType ==16 || orderType ==19) {
                 //通过订单查询趟次
                 Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(orderId);
                 BigDecimal orderTimes = DataChange.dataToBigDecimal(sporadicOrderTimes.get("orderTimes"));