Merge branch 'master-count-vehicle' into base-modify

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

@@ -320,7 +320,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
             }
         }
         JSONArray jsonArray = new JSONArray();
-        jsonArray.add(dedDetailDTO);
+        if (dedDetailDTO.getCost().intValue() != 0 || dedDetailDTO.getExcessCost().intValue() != 0) {
+            jsonArray.add(dedDetailDTO);
+        }
         DedDetailDTO dedDetailDTO1 = new DedDetailDTO();
         //添加更改还车公司计算费用
         if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getBookRecordId() != null) {
@@ -359,6 +361,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
                 }
             }
         }
+        if (dedDetailDTO1.getCost().intValue() != 0) {
+            jsonArray.add(dedDetailDTO1);
+        }
         jsonArray.add(dedDetailDTO1);
         orderPageVO.setDedDetailDTO(jsonArray.toJSONString());
     }