ソースを参照

'APP销售运输预约'

HUJIANGUO 3 年 前
コミット
d76324470e

+ 18 - 0
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -938,4 +938,22 @@ public class AMScontroller{
         }
         return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId);
     }
+
+    @ApiOperation(value="查询app端公开抢单")
+    @PostMapping("/getDispatchSaleOrderList")
+    public Map<String, Object> getDispatchSaleOrderList() {
+        return amsFeign.getDispatchSaleOrderList();
+    }
+
+    @ApiOperation(value="抢单/接收订单锁定")
+    @PostMapping("/lockDispatchSaleOrder")
+    public Map<String, Object> lockDispatchSaleOrder(Integer dispatchId,Integer carrierId) {
+        return amsFeign.lockDispatchSaleOrder(dispatchId, carrierId);
+    }
+
+    @ApiOperation(value="查询app端公开抢单")
+    @PostMapping("/getLockDispatchSaleOrderList")
+    public Map<String, Object> getLockDispatchSaleOrderList(Integer carrierId) {
+        return amsFeign.getLockDispatchSaleOrderList(carrierId);
+    }
 }

+ 12 - 0
src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -1068,4 +1068,16 @@ public interface AmsFeign {
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId);
 
+    @ApiOperation(value="查询app端公开抢单")
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getDispatchSaleOrderList")
+    Map<String,Object> getDispatchSaleOrderList();
+
+    @ApiOperation(value="抢单/接收订单锁定")
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/lockDispatchSaleOrder")
+    Map<String, Object> lockDispatchSaleOrder(@RequestParam Integer dispatchId,
+                                              @RequestParam Integer carrierId);
+
+    @ApiOperation(value="查询app端已抢的销售订单")
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getLockDispatchSaleOrderList")
+    Map<String, Object> getLockDispatchSaleOrderList(@RequestParam Integer carrierId);
 }

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -27,7 +27,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:192.168.4.105:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:localhost:8078}
   BmstrainFeign: