Explorar o código

'焦炭一车多趟'

HUJIANGUO %!s(int64=3) %!d(string=hai) anos
pai
achega
8761ba0f97

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

@@ -184,8 +184,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                     throw new Exception("请提醒司机确认订单!");
                     throw new Exception("请提醒司机确认订单!");
                 }
                 }
                 i += utilsService.closeOrderNormally(map);
                 i += utilsService.closeOrderNormally(map);
+                // 判断是否要自动派单
                 Map<String,Object> mapValue = omsFeign.getSaleAllMessages(orderId.intValue());
                 Map<String,Object> mapValue = omsFeign.getSaleAllMessages(orderId.intValue());
-                BigDecimal closeStatus = (BigDecimal) mapValue.get("closeStatus");
+                BigDecimal closeStatus = DataChange.dataToBigDecimal(mapValue.get("closeStatus"));
                 if (closeStatus.intValue() == 0) {
                 if (closeStatus.intValue() == 0) {
                     amsFeign.dispatchTruckOrderByCarrier(mapValue);
                     amsFeign.dispatchTruckOrderByCarrier(mapValue);
                 }
                 }

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

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