zx 3 سال پیش
والد
کامیت
16e0a59b24

+ 10 - 7
src/main/java/com/steerinfo/dil/controller/OMSController.java

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

+ 8 - 6
src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -131,12 +131,14 @@ public interface OmsFeign {
      */
     @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale")
     Map<String,Object> getDriverInfoForSale(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            @RequestParam("apiId")      Integer apiId,
-                                            @RequestParam("pageNum")    Integer pageNum,
-                                            @RequestParam("pageSize")   Integer pageSize,
-                                            @RequestParam("orderStatus")Integer orderStatus,
-                                            @RequestParam("con")        String con,
-                                            @RequestParam("saleOrderId") Integer saleOrderId
+                                            @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
     );
 
 

+ 1 - 1
src/main/resources/application-prod.yml

@@ -33,7 +33,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:localhost:8060}
+    url: ${RMSFEIGN_URL:172.16.33.166:8060}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
   OTMSFeign: