Merge branch 'master' into dev

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

@@ -660,34 +660,33 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     public int closeInwardOrder(Integer orderId, Integer sqe) {
         int i = omstruckOrderSeparateMapper.closeInwardOrder(orderId, sqe);
         Map<String, Object> map = omstruckOrderMapper.selectInwardTimeByOrderId(new BigDecimal(orderId));
-        //根据运输订单id查找需求日期是否超过一个月
-        if(map != null){
-            Date dueDate = (Date) map.get("dueTime");
-            //当前时间小于截至日期
-            long DueTime = dueDate.getTime() + 86400000;
-            //获取当前时间
-            Date date = new Date();
-            long nowTime = date.getTime();
-            if (nowTime < DueTime){
-                //推送
-                i += addNewTransportOrder(new BigDecimal(orderId));
-            }
-        }
+        ////根据运输订单id查找需求日期是否超过一个月
+        //if(map != null){
+        //    Date dueDate = (Date) map.get("dueTime");
+        //    //当前时间小于截至日期
+        //    long DueTime = dueDate.getTime() + 86400000;
+        //    //获取当前时间
+        //    Date date = new Date();
+        //    long nowTime = date.getTime();
+        //    if (nowTime < DueTime){
+        //        //推送
+        //        i += addNewTransportOrder(new BigDecimal(orderId));
+        //    }
+        //}
         //根据订单ID查找需求里面的承运范围和物资
         Map<String,Object>priceMap = omstruckOrderSeparateMapper.getPriceInfo(orderId);
+        if(priceMap.get("rangeId") ==null){
+            priceMap.put("rangeId",new BigDecimal(1));
+        }
         Map<String,Object>priceValueMap = null;
         try {
             priceValueMap = amsFeign.getInwardPriceBy(priceMap);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if(priceValueMap != null){
-            priceValueMap.put("orderId",orderId);
-            try {
+            if(priceValueMap != null){
+                priceValueMap.put("orderId",orderId);
                 i += bmsTruckFeign.addDetailsOrder(priceValueMap);
-            } catch (Exception e) {
-                e.printStackTrace();
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         return i;
     }

src/main/resources/application-dev.yml

@@ -13,13 +13,13 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8055}
   BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+    url: ${BMSTRUCKFEIGN_URL:localhost:8009}
 
 
 server:

src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   AmsFeign:
     url: ${AMSFEIGN_URL:localhost:8079}
   ImFeign:

src/main/resources/bootstrap.yml

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