Browse Source

修改oms

zx 3 years ago
parent
commit
11fe10b33f

+ 2 - 2
src/main/resources/application-dev.yml

@@ -13,9 +13,9 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:192.168.1.100:8008}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:192.168.1.100:8015}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8018}
 

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

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
     register-with-eureka: false #表示向EurekaServer注册自己 默认为true
     fetch-registry: false #是否从EurekaServer抓取已有的注册信息,默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
 

+ 2 - 0
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.xml

@@ -413,7 +413,9 @@
         left join rms_carrier rce
         on rce.carrier_id = aso.carrier_id
         <where>
+        <if test="status!=null">
             OO.ORDER_STATUS = #{status}
+        </if>
             <if test="type == 1">
                 and OO.ORDER_TYPE in (12, 13)
             </if>