Merge branch 'dev'

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -29,4 +29,6 @@ public interface OmsFeign {
     //远程调用推送websocket
     @PostMapping("api/v1/oms/omstruckorderseparates/pushMesToWebsocket")
     RESTfulResult pushMesToWebsocket(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/oms/omstruckorders/pushMessageToDriver")
+    public RESTfulResult pushMessageToDriver(@RequestBody Map<String,Object> mapValue);
 }

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

@@ -211,6 +211,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 //关闭当前订单
                 i += utilsService.closeOrderNormally(map);
                 //根据零星订单id 查询趟次多少，如果大于零发消息给司机
+
+                //omsFeign.pushMesToWebsocket(map);
+                omsFeign.pushMessageToDriver(map);
             }
             break;
         }