wing 3 years ago
parent
commit
4932e27c19

+ 12 - 4
src/main/java/com/steerinfo/dil/controller/OMSController.java

@@ -302,14 +302,22 @@ public class OMSController {
                                             Integer apiId,
                                             Integer pageNum,
                                             Integer pageSize,
-                                            Integer orderType,
                                             Integer orderStatus,
                                             String con,
-                                            @RequestParam String carrierSsoId,
-                                                   Integer shipperId
+                                            @RequestParam Integer saleOrderId
     )
     {
-        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, orderStatus, con,carrierSsoId,shipperId);
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,orderStatus, con,saleOrderId);
+    }
+    @PostMapping("/getDriverInfoForSale1")
+    public Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   Integer orderStatus,
+                                                   String con,
+                                                   String numberPlate,
+                                                   @RequestParam Integer saleOrderId
+    )
+    {
+        return omsFeign.getDriverInfoForSale1(mapValue==null?new HashMap<>():mapValue,orderStatus, con,numberPlate,saleOrderId);
     }
 
 

+ 10 - 3
src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -134,11 +134,18 @@ public interface OmsFeign {
                                             @RequestParam("apiId")      Integer apiId,
                                             @RequestParam("pageNum")    Integer pageNum,
                                             @RequestParam("pageSize")   Integer pageSize,
-                                            @RequestParam("orderType")  Integer orderType,
                                             @RequestParam("orderStatus")Integer orderStatus,
                                             @RequestParam("con")        String con,
-                                            @RequestParam("carrierSsoId")  String carrierSsoId,
-                                            @RequestParam("shipperId") Integer shipperId
+                                            @RequestParam("saleOrderId") Integer saleOrderId
+    );
+
+
+    @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale1")
+    Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            @RequestParam("orderStatus")Integer orderStatus,
+                                            @RequestParam("con")        String con,
+                                            @RequestParam("numberPlate")  String numberPlate,
+                                            @RequestParam("saleOrderId") Integer saleOrderId
     );
 
     /**