Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

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

@@ -260,14 +260,16 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         //延期扣除费用
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getViolateDetail())) {
             JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getDedDetail());
-            for (int i = 0; i < jsonArray.size(); i++) {
-                JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
-                if (jsonObject != null) {
-                    if (jsonObject.getString("cost") != null) {
-                        cost += Double.parseDouble(jsonObject.getString("cost"));
-                    }
-                    if (jsonObject.getString("excessCost") != null) {
-                        cost += Double.parseDouble(jsonObject.getString("excessCost"));
+            if(jsonArray != null && jsonArray.size() > 0) {
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
+                    if (jsonObject != null) {
+                        if (jsonObject.getString("cost") != null) {
+                            cost += Double.parseDouble(jsonObject.getString("cost"));
+                        }
+                        if (jsonObject.getString("excessCost") != null) {
+                            cost += Double.parseDouble(jsonObject.getString("excessCost"));
+                        }
                     }
                 }
             }