Merge remote-tracking branch 'origin/feature-delay-add' into feature-delay-add

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

@@ -365,8 +365,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
               initDedDetail(dedDetailDTO, OrderViolateEnum.DELAY_VEHICLE.getCode(), inProgressVO.getDelayAddPriceVO().getDelayDamageSafeAmount(), stringBuilder);
               jsonArray.add(dedDetailDTO);
               orderPageVO.setDelayVehicleDetail(jsonArray.toJSONString());
-              jsonArray.clear();
-           }
+              jsonArray = new JSONArray();
+              dedDetailDTO = new DedDetailDTO();
+           } else {
+			   orderPageVO.setDelayVehicleDetail(jsonArray.toJSONString());
+		   }
 			/**
 			 * 提前还车
 			 */
@@ -506,10 +509,13 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 					if (StringUtils.isNotBlank(a.getViolateDetail())) {
 						orderPageVo.setDedDetailDTO(a.getViolateDetail());
 					}
+					if (StringUtils.isNotBlank(a.getDelayVehicleDetail())) {
+						orderPageVo.setDelayVehicleDetail(a.getDelayVehicleDetail());
+					}
 				}
 			}
 		}
-		if (StringUtils.isBlank(orderPageVo.getDedDetailDTO())) {
+		if (StringUtils.isBlank(orderPageVo.getDedDetailDTO()) || StringUtils.isBlank(orderPageVo.getDelayVehicleDetail())) {
 			updateCrossRefund(orderPageVo);
 		}
 		orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);