订单详情翻译优化

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -1665,8 +1665,8 @@ public class AcceptCarriageOrderService {
             if (dictResDtoMap.isEmpty()) {
                 orderDetailVO.setPaymentLabel(null);
             } else {
-                if (dictResDtoMap.get(logisticsOrder.getPayment()) != null) {
-                    orderDetailVO.setPaymentLabel(dictResDtoMap.get(logisticsOrder.getPayment()).getLabel());
+                if (dictResDtoMap.get(logisticsOrder.getPayment().toString()) != null) {
+                    orderDetailVO.setPaymentLabel(dictResDtoMap.get(logisticsOrder.getPayment().toString()).getLabel());
                 }
             }
         }
@@ -1675,8 +1675,8 @@ public class AcceptCarriageOrderService {
             if (dictResDtoMap.isEmpty()) {
                 orderDetailVO.setPaymentLabel(null);
             } else {
-                if (dictResDtoMap.get(orderDetailVO.getSigningWay()) != null) {
-                    orderDetailVO.setSigningWayLabel(dictResDtoMap.get(orderDetailVO.getSigningWay()).getLabel());
+                if (dictResDtoMap.get(orderDetailVO.getSigningWay().toString()) != null) {
+                    orderDetailVO.setSigningWayLabel(dictResDtoMap.get(orderDetailVO.getSigningWay().toString()).getLabel());
                 }
             }
         }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/TransportCommonService.java

@@ -210,8 +210,8 @@ public class TransportCommonService {
         orderDetailVO.setScheduleStartTime(logisticsOrder.getStartTime() == null ? null : logisticsOrder.getStartTime());
         orderDetailVO.setScheduleEndTime(logisticsOrder.getEndTime() == null ? null : logisticsOrder.getEndTime());
         orderDetailVO.setPerformanceAmount(logisticsOrder.getLoadAmount() == null ? null : logisticsOrder.getLoadAmount());
-        orderDetailVO.setTotalLoadAmount(logisticsOrder.getTotalLoadAmount());
-        orderDetailVO.setTotalUnloadAmount(logisticsOrder.getTotalUnloadAmount());
+        orderDetailVO.setTotalLoadAmount(logisticsOrder.getTotalLoadAmount() == null ? new BigDecimal("0.00") : logisticsOrder.getTotalLoadAmount());
+        orderDetailVO.setTotalUnloadAmount(logisticsOrder.getTotalUnloadAmount() == null ? new BigDecimal("0.00") : logisticsOrder.getTotalUnloadAmount());
         orderDetailVO.setCreateTime(logisticsOrder.getCreateTime());
         orderDetailVO.setPayment(logisticsOrder.getPayment());
         if (logisticsOrder.getPayment() != null) {
@@ -219,8 +219,8 @@ public class TransportCommonService {
             if (dictResDtoMap.isEmpty()) {
                 orderDetailVO.setPaymentLabel(null);
             } else {
-                if (dictResDtoMap.get(logisticsOrder.getPayment()) != null) {
-                    orderDetailVO.setPaymentLabel(dictResDtoMap.get(logisticsOrder.getPayment()).getLabel());
+                if (dictResDtoMap.get(logisticsOrder.getPayment().toString()) != null) {
+                    orderDetailVO.setPaymentLabel(dictResDtoMap.get(logisticsOrder.getPayment().toString()).getLabel());
                 }
             }
         }
@@ -229,8 +229,8 @@ public class TransportCommonService {
             if (dictResDtoMap.isEmpty()) {
                 orderDetailVO.setPaymentLabel(null);
             } else {
-                if (dictResDtoMap.get(orderDetailVO.getSigningWay()) != null) {
-                    orderDetailVO.setSigningWayLabel(dictResDtoMap.get(orderDetailVO.getSigningWay()).getLabel());
+                if (dictResDtoMap.get(String.valueOf(orderDetailVO.getSigningWay())) != null) {
+                    orderDetailVO.setSigningWayLabel(dictResDtoMap.get(orderDetailVO.getSigningWay().toString()).getLabel());
                 }
             }
         }
@@ -242,7 +242,7 @@ public class TransportCommonService {
             SysDictResDto sysDictResDto = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.TAX_RATE_TYPE.getType(), logisticsOrder.getLossUnit());
             orderDetailVO.setLossLabel(sysDictResDto == null ? null : sysDictResDto.getLabel());
         }
-        if (logisticsOrder.getUnit()!=null){
+        if (logisticsOrder.getUnit() != null) {
             SysDictResDto sysDictResDto = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), logisticsOrder.getUnit());
             orderDetailVO.setNumberLabel(sysDictResDto == null ? null : sysDictResDto.getLabel());
         }