承运订单详情。获取字典null bugfix

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

@@ -195,12 +195,14 @@ public class TransportCommonService {
         orderDetailVO.setSettlementCycle(logisticsOrder.getSettlementCycle() == null ? null : String.valueOf(logisticsOrder.getSettlementCycle()));
         if (logisticsOrder.getSettlementCycle() != null) {
             Map<String, SysDictResDto> dtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.SETTLEMENT_CYCLE.getType());
-            orderDetailVO.setSettlementCycleLabel(dtoMap.isEmpty() ? null : dtoMap.get(String.valueOf(logisticsOrder.getSettlementCycle())).getLabel());
+            orderDetailVO.setSettlementCycleLabel(dtoMap.isEmpty() ? null :
+                    (dtoMap.get(String.valueOf(logisticsOrder.getSettlementCycle())) == null ? null : dtoMap.get(String.valueOf(logisticsOrder.getSettlementCycle())).getLabel()));
         }
         orderDetailVO.setBillingMode(logisticsOrder.getBillingMode());
         if (logisticsOrder.getBillingMode() != null) {
             Map<String, SysDictResDto> dictResDtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.CHARGING_TYPE.getType());
-            orderDetailVO.setBillingModeLabel(dictResDtoMap.isEmpty() ? null : dictResDtoMap.get(logisticsOrder.getBillingMode()).getLabel());
+            orderDetailVO.setBillingModeLabel(dictResDtoMap.isEmpty() ? null :
+                    (dictResDtoMap.get(logisticsOrder.getBillingMode()) == null ? null : dictResDtoMap.get(logisticsOrder.getBillingMode()).getLabel()));
         }
         orderDetailVO.setScheduleStartTime(logisticsOrder.getStartTime() == null ? null : logisticsOrder.getStartTime());
         orderDetailVO.setScheduleEndTime(logisticsOrder.getEndTime() == null ? null : logisticsOrder.getEndTime());
@@ -211,11 +213,23 @@ public class TransportCommonService {
         orderDetailVO.setPayment(logisticsOrder.getPayment());
         if (logisticsOrder.getPayment() != null) {
             Map<String, SysDictResDto> dictResDtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.TRADE_TYPE.getType());
-            orderDetailVO.setPaymentLabel(dictResDtoMap.isEmpty() ? null : dictResDtoMap.get(logisticsOrder.getPayment()).getLabel());
+            if (dictResDtoMap.isEmpty()) {
+                orderDetailVO.setPaymentLabel(null);
+            } else {
+                if (dictResDtoMap.get(logisticsOrder.getPayment()) != null) {
+                    orderDetailVO.setPaymentLabel(dictResDtoMap.get(logisticsOrder.getPayment()).getLabel());
+                }
+            }
         }
         if (orderDetailVO.getSigningWay() != null) {
             Map<String, SysDictResDto> dictResDtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.SIGNING_TYPE.getType());
-            orderDetailVO.setSigningWayLabel(dictResDtoMap.isEmpty() ? null : dictResDtoMap.get(orderDetailVO.getSigningWay()).getLabel());
+            if (dictResDtoMap.isEmpty()) {
+                orderDetailVO.setPaymentLabel(null);
+            } else {
+                if (dictResDtoMap.get(orderDetailVO.getSigningWay()) != null) {
+                    orderDetailVO.setSigningWayLabel(dictResDtoMap.get(orderDetailVO.getSigningWay()).getLabel());
+                }
+            }
         }
         return orderDetailVO;
     }

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -543,14 +543,11 @@
     </select>
 
     <select id="countAmountByTradeOrderId" resultType="java.util.Map">
-        SELECT SUM(
-                       IFNULL(unload_amount, 0))       as unloadAmount,
-               SUM(
-                       IFNULL(load_amount, 0))         as loadAmount,
-               SUM(
-                       IFNULL(total_load_amount, 0))   AS totalLoadAmount,
-               SUM(
-                       IFNULL(total_unload_amount, 0)) AS totalUnloadAmount
+        SELECT
+               IFNULL(SUM(unload_amount), 0)       AS unloadAmount,
+               IFNULL(SUM(load_amount), 0)         AS loadAmount,
+               IFNULL(SUM(total_load_amount), 0)   AS totalLoadAmount,
+               IFNULL(SUM(total_unload_amount), 0) AS totalUnloadAmount
         FROM kwt_logistics_order
         WHERE del_flag = 0
           AND t_order_id = #{tOrderId}