asd

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

@@ -677,4 +677,10 @@ public class OMSController {
     public Map<String, Object> getCapacityAllOrder(String capacityNumber){
         return omsFeign.getCapacityAllOrder(capacityNumber);
     }
+
+    @ApiOperation(value = "查询订单是否确认")
+    @PostMapping("/getDriverConfirmation")
+    public Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map) {
+        return omsFeign.getDriverConfirmation(map);
+    }
 }

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

@@ -1164,7 +1164,7 @@ public interface AmsFeign {
 //                                                      @RequestParam Integer apiId,
 //                                                      @RequestParam String con) ;
 
-    @PostMapping("/api/v1销售/ams/amsdispatchsaleorders/getPCDispatchSaleOrderList")
+    @PostMapping("/api/v1/ams/amsdispatchsaleorders/getPCDispatchSaleOrderList")
     Map<String, Object> getPCDispatchSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
                                                       @RequestParam Integer pageNum,
                                                       @RequestParam Integer pageSize,

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

@@ -386,5 +386,8 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorderseparates/getCapacityAllOrder")
     Map<String, Object> getCapacityAllOrder(@RequestParam String capacityNumber);
 
+    @ApiOperation(value = "查询订单是否确认")
+    @PostMapping("api/v1/oms/omstruckorders/getDriverConfirmation")
+    Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map);
 }
 

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -89,5 +89,5 @@ public interface UniversalMapper {
     Integer getSaleOrderStatus(BigDecimal orderId);
 
     //通过运输订单号查询订单类型和ID
-    Map<String, Object> getOrderMesByOrderNumber(String orderNumber);
+        Map<String, Object> getOrderMesByOrderNumber(String orderNumber);
 }

src/main/resources/application-dev.yml

@@ -6,4 +6,3 @@ spring:
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api
-

src/main/resources/bootstrap.yml

@@ -16,66 +16,11 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
-openfeign:
-  #  正式环境
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  AmsFeign:
-    url: ${AMSFEIGN_URL:192.168.1.108:8079}
-  BmsshipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
-  BmstrainFeign:
-    url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
-  BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
-  QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
-  TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
-  TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:192.168.1.108:8088}
-  TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
-  WMSHFeign:
-    url: ${WMSHFEIGN_URL:172.16.33.166:8070}
-  WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8093}
-  OMSFeign:
-    url: ${OMSFEIGN_URL:192.168.1.108:8095}
-  RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.33.166:8060}
-  #测试环境
-#  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
-#  AmsFeign:
-#    url: ${AMSFEIGN_URL:172.16.33.162:8015}
-#  BmsshipFeign:
-#    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
-#  BmstrainFeign:
-#    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
-#  BmstruckFeign:
-#    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
-#  QmsTruckFeign:
-#    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
-#  TmsTrainFeign:
-#    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
-#  TmsTruckFeign:
-#    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
-#  TmsshipFeign:
-#    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
-#  WMSHFeign:
-#    url: ${WMSHFEIGN_URL:172.16.33.162:8013}
-#  WMSFeign:
-#    url: ${WMSFEIGN_URL:172.16.33.162:8012}
-#  OMSFeign:
-#    url: ${OMSFEIGN_URL:172.16.33.162:8016}
-#  RmsFeign:
-#    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
 genxml:
   pth: com/a
@@ -96,8 +41,6 @@ redis:
     time: 864000000
   database: 0
 
-
-
 mybatis:
   type-aliases-package: com.steerinfo.dil.model
   mapper-locations: classpath:com/steerinfo/dil/mapper/*.xml
@@ -105,7 +48,4 @@ mybatis:
     #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
-server:
-  port: 8080
-#测试环境
-#  port: 8019
+

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -584,7 +584,7 @@
     </select>
 
 <!--  通过运输订单号查询订单类型和ID  -->
-    <select id="getOrderMesByOrderId" parameterType="string" resultType="java.util.Map">
+    <select id="getOrderMesByOrderNumber" parameterType="string" resultType="java.util.Map">
         select OO.ORDER_ID "orderId",
                OO.ORDER_TYPE "orderType"
         from OMSTRUCK_ORDER OO