Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderSeparateServiceImpl.java

@@ -686,10 +686,10 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
                 }
             }
         }
-        //根据订单ID查找需求里面的承运范围和物资
-        Map<String,Object>priceMap = omstruckOrderSeparateMapper.getPriceInfo(orderId);
-        Map<String,Object>priceValueMap = null;
+        //根据订单ID查找需求里面的承运范围和物资ID、物资品类ID
         try {
+            Map<String,Object> priceMap = omstruckOrderSeparateMapper.getPriceInfo(orderId);
+            Map<String,Object> priceValueMap = null;
             priceValueMap = amsFeign.getInwardPriceBy(priceMap);
             if(priceValueMap != null){
                 priceValueMap.put("netWeight", resultNetWeight);
@@ -698,6 +698,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
             }
         } catch (Exception e) {
             e.printStackTrace();
+            System.out.println(e.getMessage());
         }
         return i;
     }

src/main/resources/bootstrap.yml

@@ -17,11 +17,11 @@ eureka:
   client:
     service-url:
       defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
-    register-with-eureka: true #表示向EurekaServer注册自己 默认为true
-    fetch-registry: true #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
+    register-with-eureka: false #表示向EurekaServer注册自己 默认为true
+    fetch-registry: false #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
 
   instance:
-    prefer-ip-address: true
+    prefer-ip-address: false
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}