luobang 2 năm trước cách đây
mục cha
commit
6d44e86f4e

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

@@ -728,18 +728,22 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         //根据订单ID查找需求里面的承运范围和物资ID、物资品类ID
         try {
             Map<String,Object> priceMap = omstruckOrderSeparateMapper.getPriceInfo(orderId);
-            Map<String,Object> priceValueMap = null;
+            Map<String,Object> priceValueMap = new HashMap<>();
+            Map<String,Object> priceValueMap1 = new HashMap<>();
+
             if(priceMap != null){
                 if(priceMap.get("rangeId") == null) {
                     priceMap.put("rangeId",1);
                 }
-                priceValueMap = amsFeign.getInwardPriceBy(priceMap);
-            }
-            if(priceValueMap != null){
-                priceValueMap.put("netWeight", resultNetWeight);
-                priceValueMap.put("orderId",orderId);
-                RESTfulResult resTfulResult =  bmsTruckFeign.addDetailsOrder(priceValueMap);
+                priceValueMap1 = amsFeign.getInwardPriceBy(priceMap);
+                if(priceValueMap1 != null) {
+                    priceValueMap.putAll(priceValueMap1);
+                }
             }
+            priceValueMap.put("netWeight", resultNetWeight);
+            priceValueMap.put("orderId",orderId);
+            RESTfulResult resTfulResult =  bmsTruckFeign.addDetailsOrder(priceValueMap);
+
         } catch (Exception e) {
             e.printStackTrace();
             System.out.println(e.getMessage());

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

@@ -20,7 +20,7 @@ openfeign:
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+    url: ${BMSTRUCKFEIGN_URL:localhost:8076}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
 server: