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

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderViolateEnum.java

@@ -8,6 +8,7 @@ public enum OrderViolateEnum {
     BEFORE(1, "提前"),
     AFTER(2, "延期"),
     CHANGE(3, "更换还车公司"),
+    DELAY_VEHICLE(4, "延长还车不计免赔")
     ;
     /**
      * 编码

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderVehicleCrosstown.java

@@ -112,6 +112,12 @@ public class OrderVehicleCrosstown {
     @Column(name = "violate_amount_detail")
     private String violateDetail;
 
+    /**
+     * 延期还车，不计免赔额计算
+     */
+    @Column(name = "delay_vehicle_detail")
+    private String delayVehicleDetail;
+
     /**
      *  1、交车， 2、还车, 3、定损还车
      */

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/DedDetailDTO.java

@@ -33,6 +33,7 @@ public class DedDetailDTO {
 
     //作为：DedDetail ：2、车辆损坏 3、其他
     //作为：violate_amount_detail 1--提前还车 2--延期还车 3--更换还车公司费用
+    //作为：delay_vehicle_detail
     Integer type;
 
     //小雨都不知道什么东西

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java

@@ -40,6 +40,8 @@ public class OrderPageVO extends BaseOrder {
     private  String positionName;
     //订单违约金
     private String dedDetailDTO;
+    //订单延长还车，不计免赔额
+    private String delayVehicleDetail;
     /**
      * 車輛編碼
      */

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

@@ -146,8 +146,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 	}
 
 
-     public  PageDataVO<MemberOrderBo> findMemberOrderPage(MemberOrderFindDTO memberOrderFindDTO){
-        return PageDataVO.pageInfo(memberOrderFindDTO.getPage(),memberOrderFindDTO.getLimit(),()->mapper.findMemberOrders(memberOrderFindDTO));
+	public PageDataVO<MemberOrderBo> findMemberOrderPage(MemberOrderFindDTO memberOrderFindDTO) {
+		return PageDataVO.pageInfo(memberOrderFindDTO.getPage(), memberOrderFindDTO.getLimit(), () -> mapper.findMemberOrders(memberOrderFindDTO));
 	}
 
 	public List<MemberOrderBo> findMemberOrders(MemberOrderFindDTO memberOrderFindDTO) {
@@ -167,11 +167,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		if (orderPageVo == null) {
 			return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
 		}
-        if(orderPageVo.getStatus() <= 3 && orderPageVo.getStatus() != 2 && orderPageVo.getStatus() != -1) {
+		if (orderPageVo.getStatus() <= 3 && orderPageVo.getStatus() != 2 && orderPageVo.getStatus() != -1) {
 			return ObjectRestResponse.createFailedResult(ResCode.ORDER_DETAIL_IS_NOT_EXIST.getCode(), ResCode.ORDER_DETAIL_IS_NOT_EXIST.getDesc());
 		}
 		AppUserDTO appUserVo = userFeign.userDetailById(orderPageVo.getUserId()).getData();
-        if(appUserVo != null) {
+		if (appUserVo != null) {
 			orderPageVo.setTelephone(appUserVo.getUsername());
 			orderPageVo.setUsername(appUserVo.getRealname());
 		}
@@ -183,7 +183,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			if (!companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId()) && !companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
 				return ObjectRestResponse.createFailedResult(ResCode.YOU_AUTH_FAIL.getCode(), ResCode.YOU_AUTH_FAIL.getDesc());
 			}
-            if(userDTO.getCompanyId() == orderPageVo.getOrderRentVehicleDetail().getEndCompanyId()) {
+			if (userDTO.getCompanyId() == orderPageVo.getOrderRentVehicleDetail().getEndCompanyId()) {
 				orderPageVo.setUserCompanyStatus(true);
 			}
 			if (orderPageVo.getStatus() == 4) { //未交车
@@ -213,7 +213,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			}
 
 		} else if (orderPageVo.getOrderTourDetail() != null) {
-            if(StringUtils.isNotBlank(orderPageVo.getOrderTourDetail().getTourUserIds())) {
+			if (StringUtils.isNotBlank(orderPageVo.getOrderTourDetail().getTourUserIds())) {
 				List<TourUser> list = tourFeign.getTourUsers(orderPageVo.getOrderTourDetail().getTourUserIds()).getData();
 				orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? new ArrayList<>() : list);
 			}
@@ -223,7 +223,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
 		BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
 		orderPageVo.setIllegalReserve(illegalReserve);
-        orderPageVo.setItems(orderItemBiz.selectList(new OrderItem(){{
+		orderPageVo.setItems(orderItemBiz.selectList(new OrderItem() {{
 			setOrderId(orderPageVo.getId());
 		}}));
 		return ObjectRestResponse.succ(orderPageVo);
@@ -232,6 +232,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 	/**
 	 * 后台获取订单详情
+	 *
 	 * @param no
 	 * @param userDTO
 	 * @return
@@ -242,7 +243,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
 		}
 		AppUserDTO appUserVo = userFeign.userDetailById(orderPageVo.getUserId()).getData();
-		if(appUserVo != null) {
+		if (appUserVo != null) {
 			orderPageVo.setTelephone(appUserVo.getUsername());
 			orderPageVo.setUsername(appUserVo.getRealname());
 			orderPageVo.setPositionName(appUserVo.getPositionName());
@@ -255,7 +256,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			if (!companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId()) && !companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
 				return ObjectRestResponse.createFailedResult(ResCode.YOU_AUTH_FAIL.getCode(), ResCode.YOU_AUTH_FAIL.getDesc());
 			}
-			if(userDTO.getCompanyId() == orderPageVo.getOrderRentVehicleDetail().getEndCompanyId()) {
+			if (userDTO.getCompanyId() == orderPageVo.getOrderRentVehicleDetail().getEndCompanyId()) {
 				orderPageVo.setUserCompanyStatus(true);
 			}
 			if (orderPageVo.getStatus() == 4) { //未交车
@@ -285,7 +286,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			}
 
 		} else if (orderPageVo.getOrderTourDetail() != null) {
-			if(StringUtils.isNotBlank(orderPageVo.getOrderTourDetail().getTourUserIds())) {
+			if (StringUtils.isNotBlank(orderPageVo.getOrderTourDetail().getTourUserIds())) {
 				List<TourUser> list = tourFeign.getTourUsers(orderPageVo.getOrderTourDetail().getTourUserIds()).getData();
 				orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? new ArrayList<>() : list);
 			}
@@ -295,7 +296,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
 		BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
 		orderPageVo.setIllegalReserve(illegalReserve);
-		orderPageVo.setItems(orderItemBiz.selectList(new OrderItem(){{
+		orderPageVo.setItems(orderItemBiz.selectList(new OrderItem() {{
 			setOrderId(orderPageVo.getId());
 			setType(104);
 		}}));
@@ -344,19 +345,21 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		orderRentVehicleBiz.updateSelectiveById(orderPageVO.getOrderRentVehicleDetail());
 		//实际预定的天数
 		int actualDay = orderCalculateBiz.getIncludeDays(startTime, endTime);
-        Integer orderId = orderPageVO.getId();
-        List<OrderItem> items = orderItemBiz.selectList(new OrderItem() {{
-            setOrderId(orderId);
-        }});
-        //租车车辆单价
-        BigDecimal amount = new BigDecimal(0);
-        if (items != null && items.size() > 0) {
-            for (OrderItem orderItem : items) {
-                if (orderItem.getType() == ItemTypeEnum.VEHICLE_MODEL.getCode()) {
-                    amount = orderItem.getUnitPrice();
-                    break;
-                }
-            }
+		InProgressVO inProgressVO = orderCalculateBiz.inProgressCalculate(orderPageVO, userUsedDay);
+        JSONArray jsonArray = new JSONArray();
+        if (inProgressVO != null) {
+                //新增延长还车，不计免赔额,金额大于0才显示
+           if (inProgressVO.getDelayDamageSafeAmount() != null && inProgressVO.getDelayDamageSafeAmount().doubleValue() > 0) {
+              StringBuilder stringBuilder = new StringBuilder();
+              stringBuilder.append("延长用车");
+              stringBuilder.append(inProgressVO.getDelayAddDays());
+              stringBuilder.append("天,  补扣不计免赔费用");
+              stringBuilder.append(inProgressVO.getDelayDamageSafeAmount());
+              stringBuilder.append("元");
+              initDedDetail(dedDetailDTO, OrderViolateEnum.DELAY_VEHICLE.getCode(), inProgressVO.getDelayDamageSafeAmount(), stringBuilder);
+              jsonArray.add(dedDetailDTO);
+              orderPageVO.setDelayVehicleDetail(jsonArray.toJSONString());
+              jsonArray.clear();
            }
 			/**
 			 * 提前还车
@@ -366,10 +369,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 				//提前的天数, 当天就算使用一天
 				int noUsedDay = actualDay - userUsedDay;
 				//退还未使用的天数，或者金额，扣除违约金，实际未使用天数的金额，最多3000元
-            InProgressVO inProgressVO = orderCalculateBiz.inProgressCalculate(orderPageVO, userUsedDay);
-            if (inProgressVO != null) {
 				//消费超额金
-                if(inProgressVO.getExtraAmount() != null) {
+				if (inProgressVO.getExtraAmount() != null) {
 					dedDetailDTO.setExcessCost(inProgressVO.getExtraAmount());
 				}
 				stringBuilder.append("违约金( ");
@@ -377,7 +378,6 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 				stringBuilder.append("天) = ");
 				stringBuilder.append(inProgressVO.getViolateAmount());
 				initDedDetail(dedDetailDTO, OrderViolateEnum.BEFORE.getCode(), inProgressVO.getViolateAmount(), stringBuilder);
-            }
 				/**
 				 * 延期还车
 				 */
@@ -385,10 +385,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 				StringBuilder stringBuilder = new StringBuilder();
 				stringBuilder.append("违约金( ");
 				//延期的天数, 延期违约金是延期天数*200%
-            InProgressVO inProgressVO = orderCalculateBiz.inProgressCalculate(orderPageVO, userUsedDay);
-            if (inProgressVO != null) {
 				int extraUsedDay = userUsedDay - actualDay;
-            if(extraUsedDay > 0) {
+				if (extraUsedDay > 0) {
 					stringBuilder.append(extraUsedDay);
 					stringBuilder.append("(天)");
 					stringBuilder.append(" x 2)");
@@ -397,11 +395,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 					stringBuilder.append("元");
 					initDedDetail(dedDetailDTO, OrderViolateEnum.AFTER.getCode(), inProgressVO.getViolateAmount(), stringBuilder);
 				}
-
 			}
 		}
-        JSONArray jsonArray = new JSONArray();
-        if ((dedDetailDTO.getCost() != null && dedDetailDTO.getCost().doubleValue() != 0) || (dedDetailDTO.getExcessCost()!=null && dedDetailDTO.getExcessCost().doubleValue() != 0)) {
+		if ((dedDetailDTO.getCost() != null && dedDetailDTO.getCost().doubleValue() != 0) || (dedDetailDTO.getExcessCost() != null && dedDetailDTO.getExcessCost().doubleValue() != 0)) {
 			jsonArray.add(dedDetailDTO);
 		}
 		DedDetailDTO dedDetailDTO1 = new DedDetailDTO();
@@ -409,11 +405,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getBookRecordId() != null) {
 			//查询是否有更换还车记录
 			List<BookRecordUpdateLog> bookRecordUpdateLogs = vehicleFeign.get(orderPageVO.getOrderRentVehicleDetail().getBookRecordId()).getData();
-            if(bookRecordUpdateLogs != null && bookRecordUpdateLogs.size() > 0) {
+			if (bookRecordUpdateLogs != null && bookRecordUpdateLogs.size() > 0) {
 				orderPageVO.setBookRecordUpdateLogs(bookRecordUpdateLogs);
 				//有更换记录，则需要计算更换费用
 				//原始公司经纬度，列表中最后一个 bookRecordUpdateLogs.get(bookRecordUpdateLogs.size -1 ) 最后还车公司是列表中的第一条中的getNewRetCompanyId
-                BookRecordUpdateLog oldCompany = bookRecordUpdateLogs.get(bookRecordUpdateLogs.size() -1);
+				BookRecordUpdateLog oldCompany = bookRecordUpdateLogs.get(bookRecordUpdateLogs.size() - 1);
 				BookRecordUpdateLog newCompany = bookRecordUpdateLogs.get(0);
 				if (oldCompany != null && newCompany != null) {
 					CompanyDetail oldCompanyDetail = vehicleFeign.getCompanyDetail(oldCompany.getOldRetCompanyId()).getData();
@@ -451,6 +447,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 	/**
 	 * 初始化违约金实体
+	 *
 	 * @param dedDetailDTO
 	 * @param type
 	 * @param cost
@@ -467,6 +464,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		} else if (type == OrderViolateEnum.CHANGE.getCode()) {
 			dedDetailDTO.setType(OrderViolateEnum.CHANGE.getCode());
 			detailName = "更换还车公司";
+		} else if (type == OrderViolateEnum.DELAY_VEHICLE.getCode()) {
+            dedDetailDTO.setType(1);
+            detailName = "延长还车";
         }
 		//900元+违约金（￥900x2天=）1800元
 		dedDetailDTO.setDeductions(stringBuilder.toString());
@@ -478,6 +478,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 	/**
 	 * 获取驾驶人驾照
+	 *
 	 * @param orderPageVo
 	 */
 	public void getUserLicense(OrderPageVO orderPageVo) {
@@ -495,8 +496,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			}
 			//设置违约明细
 			for (OrderVehicleCrosstownDto a : orderVehicleCrosstown) {
-                if(a.getType() != CrosstownTypeEnum.DEPARTURE.getCode()) {
-                    if(StringUtils.isNotBlank(a.getViolateDetail())) {
+				if (a.getType() != CrosstownTypeEnum.DEPARTURE.getCode()) {
+					if (StringUtils.isNotBlank(a.getViolateDetail())) {
 						orderPageVo.setDedDetailDTO(a.getViolateDetail());
 					}
 				}
@@ -524,8 +525,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			}
 			//设置违约明细
 			for (OrderVehicleCrosstownDto a : orderVehicleCrosstown) {
-                if(a.getType() != CrosstownTypeEnum.DEPARTURE.getCode()) {
-                    if(StringUtils.isNotBlank(a.getViolateDetail())) {
+				if (a.getType() != CrosstownTypeEnum.DEPARTURE.getCode()) {
+					if (StringUtils.isNotBlank(a.getViolateDetail())) {
 						orderPageVo.setDedDetailDTO(a.getViolateDetail());
 					}
 				}
@@ -536,6 +537,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 	/**
 	 * 获取驾驶人信息
+	 *
 	 * @param orderPageVo
 	 */
 	public void getDriverInfo(OrderPageVO orderPageVo) {
@@ -567,6 +569,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 	/**
 	 * 修改订单还车公司
+	 *
 	 * @param orderRentVehicleDetail
 	 * @return
 	 */
@@ -582,11 +585,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 		StringBuilder stringBuilder = new StringBuilder();
 		OrderRentVehicleDetail oldValue = orderRentVehicleBiz.selectById(orderRentVehicleDetail.getId());
-        if(oldValue == null) {
+		if (oldValue == null) {
 			return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
 		}
 		stringBuilder.append("修改订单和预定记录还车公司成功, 订单ID:");
-        stringBuilder.append( oldValue.getOrderId());
+		stringBuilder.append(oldValue.getOrderId());
 		stringBuilder.append("; 原还车公司ID: ");
 		stringBuilder.append(oldValue.getEndCompanyId());
 		stringBuilder.append("; 更新后还车公司ID: ");
@@ -606,14 +609,14 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		bookRecordUpdateLog.setCreateTime(new Date());
 		BeanUtil.copyProperties(orderRentVehicleDetail, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
 		CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(orderRentVehicleDetail.getEndCompanyId()).getData();
-        if(companyDetail != null) {
+		if (companyDetail != null) {
 			oldValue.setEndCity(companyDetail.getAddrCity());
 			oldValue.setEndAddr(companyDetail.detailAddr());
 		}
 		oldValue.setEndCompanyId(orderRentVehicleDetail.getEndCompanyId());
 		orderRentVehicleBiz.updateSelectiveByIdRe(oldValue);
 		ObjectRestResponse objectRestResponse = vehicleFeign.update(bookRecordUpdateLog);
-        if (objectRestResponse!= null && objectRestResponse.getRel()) {
+		if (objectRestResponse != null && objectRestResponse.getRel()) {
 			log.info(stringBuilder.toString());
 			return ObjectRestResponse.succ();
 		}
@@ -623,6 +626,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 	/**
 	 * 获取订单详情，包含驾驶人信息，违约金等信息
+	 *
 	 * @param no
 	 * @return
 	 */
@@ -647,7 +651,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 				orderPageVo.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
 			}
 		} else if (orderPageVo.getOrderTourDetail() != null) {
-            if(StringUtils.isNotBlank(orderPageVo.getOrderTourDetail().getTourUserIds())) {
+			if (StringUtils.isNotBlank(orderPageVo.getOrderTourDetail().getTourUserIds())) {
 				List<TourUser> list = tourFeign.getTourUsers(orderPageVo.getOrderTourDetail().getTourUserIds()).getData();
 				orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? new ArrayList<>() : list);
 			}
@@ -656,7 +660,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
 		BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
 		orderPageVo.setIllegalReserve(illegalReserve);
-        orderPageVo.setItems(orderItemBiz.selectList(new OrderItem(){{
+		orderPageVo.setItems(orderItemBiz.selectList(new OrderItem() {{
 			setOrderId(orderPageVo.getId());
 		}}));
 		return ObjectRestResponse.succ(orderPageVo);
@@ -756,7 +760,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 				//处理后台用户提醒短信的发送
 //                orderMsgBiz.handelBgUserMsg4Pay(orvd, baseOrder, appUserDTO, OrderMsgBiz.RENT_PAY);
 				sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_PAY);
-                if(OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
+				if (OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
 					sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_FINISH);
 				}
 			}
@@ -814,7 +818,6 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 	}
 
 
-
 //    /**
 //     * 更新（不成功抛异常）
 //     * @param baseOrder
@@ -845,7 +848,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 	private void sendQueue(OrderMQDTO orderMQDTO, Integer sign) {
 		try {
 			orderMQDTO.setSign(sign);
-            SendMsgDTO sendMsgDTO = new SendMsgDTO(){{
+			SendMsgDTO sendMsgDTO = new SendMsgDTO() {{
 				setExchange(ORDER_TOPIC);
 			}};
 			sendMsgDTO.setJson(JSONUtil.toJsonStr(orderMQDTO));
@@ -897,6 +900,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 	/**
 	 * 获取退还优惠卷
+	 *
 	 * @param orderId
 	 */
 	public List<Coupon> getReturnCouponByOrderId(Integer orderId) {

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

@@ -348,6 +348,18 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 }
             }
         }
+		//延期扣除费用
+		if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getDelayVehicleDetail())) {
+			JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getDelayVehicleDetail());
+			if (jsonArray != null && jsonArray.size() > 0) {
+				for (int i = 0; i < jsonArray.size(); i++) {
+					JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
+					if (jsonObject.getString("cost") != null) {
+						cost += Double.parseDouble(jsonObject.getString("cost"));
+					}
+				}
+			}
+		}
         orderVehicleCrosstownDto.setUserLicenseImg(orderVehicleCrosstownDto.getLicenseImg());
         //扣除费用,每次都是重新计算
         BigDecimal amount = new BigDecimal(cost.toString()).divide(new BigDecimal("1"), 2, BigDecimal.ROUND_UP);

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

 package com.xxfc.platform.vehicle.feign;
 
-import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -16,7 +15,9 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Created by ace on 2017/9/15.
@@ -200,4 +201,12 @@ public interface VehicleFeign {
                                                                                                @RequestParam(value = "endDate") Long endDate,
                                                                                                @RequestParam(value = "vehicleModelId") Integer vehicleModelId,
                                                                                                @RequestParam(value = "userId") Integer userId);
+    /**
+     * 订单修改订单时间，同时需要修改预定记录
+     *  * @param bookVehicleVo
+     * @return
+     */
+    @RequestMapping(value = "/vehicleInfo/bookRecord/order-update", method = RequestMethod.POST)
+    public RestResponse updateOrderBookRecord(@RequestBody  BookVehicleVO bookVehicleVo) throws Exception;
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -229,6 +229,24 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         return RestResponse.suc();
     }
 
+    /**
+     * 订单修改订单时间，同时需要修改预定记录
+     *  * @param bookVehicleVo
+     * @return
+     */
+    @RequestMapping(value = "/bookRecord/order-update", method = RequestMethod.POST)
+    @ApiOperation(value = "订单修改订单时间")
+    public RestResponse updateOrderBookRecord(@RequestBody  BookVehicleVO bookVehicleVo) throws Exception {
+        Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
+        String userName = BaseContextHandler.getName();
+        bookVehicleVo.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
+        bookVehicleVo.setNotCheckTimeLegal(Boolean.FALSE);
+        baseBiz.applyVehicle(operatorId, bookVehicleVo, userName);
+        return RestResponse.suc();
+    }
+
+
+
     /**
      * 申请预定车辆 需要审核
      *