luobang 3 years ago
parent
commit
ca489269d8

+ 1 - 1
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderSeparateServiceImpl.java

@@ -683,7 +683,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         try {
             priceValueMap = amsFeign.getInwardPriceBy(priceMap);
             if(priceValueMap != null){
-                priceValueMap.put("resultNetWeight", resultNetWeight);
+                priceValueMap.put("netWeight", resultNetWeight);
                 priceValueMap.put("orderId",orderId);
                 i += bmsTruckFeign.addDetailsOrder(priceValueMap);
             }

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

@@ -15,10 +15,10 @@ openfeign:
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:localhost:8076}
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
 server:
   port: 8095

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

@@ -1,7 +1,7 @@
 api.version: api/v1/oms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8