Merge branch 'dev'

src/main/java/com/steerinfo/dil/controller/OmstruckOrderController.java

@@ -11,6 +11,7 @@ import com.steerinfo.dil.util.PageListAdd;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -312,6 +313,16 @@ public class OmstruckOrderController extends BaseRESTfulController {
         return success(pageList);
 
     }
+    @ApiOperation(value="判断一车多单是否还有订单，如果还有就推送消息再给司机")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name ="mapValue",value = "orderId")
+    })
+    @PostMapping("/pushMessageToDriver")
+    public RESTfulResult pushMessageToDriver(@RequestBody Map<String,Object> mapValue){
+
+        omstruckOrderService.pushMessageToDriver(mapValue);
+        return null;
+    }
 
     @ApiOperation(value = "司机接收、拒绝接单")
     @ApiImplicitParams({

src/main/java/com/steerinfo/dil/service/IOmstruckOrderService.java

@@ -182,4 +182,8 @@ public interface IOmstruckOrderService {
 
     // 新增采购进口矿订单
     int addInputOrder(Map<String, Object> mapValue);
+
+    void pushMesToWebsocket(Map<String, Object> map);
+
+    void pushMessageToDriver(Map<String, Object> mapValue);
 }

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

@@ -499,6 +499,16 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         System.out.println(s);
     }
 
+    @Override//判断一车多单是否还有订单，如果又就再推送消息给他
+    public void pushMessageToDriver(Map<String, Object> mapValue) {
+
+        Integer sporadicOrderTimes  =omstruckOrderMapper.getSporadicOrderTimes(new BigDecimal(mapValue.get("orderId").toString()));
+        if (sporadicOrderTimes>0){
+            pushMesToWebsocket(mapValue);
+        }
+
+    }
+
     /**
      * 销售物流，下发订单
      *