Merge branch 'master-count-vehicle' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -316,7 +316,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
             }
         }
         JSONArray jsonArray = new JSONArray();
-        if ((dedDetailDTO.getCost() != null && dedDetailDTO.getCost().intValue() != 0) || (dedDetailDTO.getExcessCost()!=null && dedDetailDTO.getExcessCost().intValue() != 0)) {
+        if ((dedDetailDTO.getCost() != null && dedDetailDTO.getCost().doubleValue() != 0) || (dedDetailDTO.getExcessCost()!=null && dedDetailDTO.getExcessCost().doubleValue() != 0)) {
             jsonArray.add(dedDetailDTO);
         }
         DedDetailDTO dedDetailDTO1 = new DedDetailDTO();
@@ -357,7 +357,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
                 }
             }
         }
-        if (dedDetailDTO1.getCost().intValue() != 0) {
+        if (dedDetailDTO1.getCost() != null && dedDetailDTO1.getCost().doubleValue() != 0) {
             jsonArray.add(dedDetailDTO1);
         }
         orderPageVO.setDedDetailDTO(jsonArray.toJSONString());