Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API into dev

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

@@ -678,6 +678,12 @@ public class OMSController {
         return omsFeign.getCapacityAllOrder(capacityNumber);
     }
 
+    @ApiOperation(value = "根据运单id关闭运输订单")
+    @PostMapping("/closeOrder")
+    public Map<String, Object> closeOrder(@RequestParam Integer orderId) {
+        return omsFeign.closeOrder(orderId);
+    }
+
     @ApiOperation(value = "查询订单是否确认")
     @PostMapping("/getDriverConfirmation")
     public Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map) {

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

@@ -386,6 +386,10 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorderseparates/getCapacityAllOrder")
     Map<String, Object> getCapacityAllOrder(@RequestParam String capacityNumber);
 
+    @ApiOperation(value = "根据运单id关闭运输订单")
+    @PostMapping("api/v1/oms/omstruckorderseparates/closeOrder")
+    Map<String, Object> closeOrder(@RequestParam Integer orderId);
+
     @ApiOperation(value = "查询订单是否确认")
     @PostMapping("api/v1/oms/omstruckorders/getDriverConfirmation")
     Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map);

src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@ spring:
     name: dil-api
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
     url: ${AMSFEIGN_URL:192.168.1.113:8015}
   BmsshipFeign: