Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount

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

+package com.xxfc.platform.order.contant.enumerate;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrderViolateEnum {
+    BEFORE(1, "提前"),
+    AFTER(2, "延期")
+    ;
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    public static Map<Integer, OrderTypeEnum> codeAndDesc = new HashMap<Integer, OrderTypeEnum>();
+    //Maps.newHashMap();
+
+    static{
+        for(OrderTypeEnum enumE : OrderTypeEnum.values()){
+            codeAndDesc.put(enumE.getCode(), enumE);
+        }
+    }
+
+    OrderViolateEnum(Integer code, String desc){
+        this.code=code;
+        this.desc=desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public static Boolean exists(Integer code){
+        return codeAndDesc.containsKey(code);
+    }
+
+    public static OrderTypeEnum get(Integer code) {
+        for(OrderTypeEnum enumE : OrderTypeEnum.values()) {
+            if (enumE.getCode().equals(code)) {
+                return enumE;
+            }
+        }
+        return null;
+    }
+}

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

@@ -105,6 +105,13 @@ public class OrderVehicleCrosstown {
      */
     private String dedDetail;
 
+
+    /**
+     * 租车违约金明细
+     */
+    @Column(name = "violate_amount_detail")
+    private String violateDetail;
+
     /**
      *  1、交车， 2、还车, 3、定损还车
      */

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

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
@@ -13,12 +12,12 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.activity.user.UserInfoBiz;
-import com.xxfc.platform.order.contant.enumerate.CrosstownTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.DepositRefundStatus;
-import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
+import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
+import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.OrderVehicaleCrosstownMapper;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
+import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
@@ -36,12 +35,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
@@ -66,18 +66,22 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
     @Autowired
     UserFeign userFeign;
     @Autowired
-    private OrderRentVehicleBiz orderRentVehicleBiz;
-
+    OrderRentVehicleBiz orderRentVehicleBiz;
     @Autowired
-    private OrderDepositRefundRecordBiz orderDepositRefundRecordBiz;
-
+    OrderDepositRefundRecordBiz orderDepositRefundRecordBiz;
     @Autowired
     BaseOrderBiz baseOrderBiz;
+    @Autowired
+    OrderItemBiz orderItemBiz;
+    @Autowired
+    OrderCalculateBiz orderCalculateBiz;
 
     public OrderVehicleCrosstown get(Integer id) {
         return selectById(id);
     }
 
+    public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");
+
     public List<OrderVehicleCrosstownDto> selectByOrderId(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
 
         List<OrderVehicleCrosstownDto> list = mapper.selectByOrderId(orderVehicleCrosstownDto);
@@ -151,7 +155,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     @Transactional(rollbackFor = Exception.class)
     public ObjectRestResponse<OrderVehicleCrosstownDto> add(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
-        log.info("添加的参数：orderVehicaleCrosstown = {}", orderVehicleCrosstownDto);
+        log.info("交还车参数：orderVehicaleCrosstown = {}", orderVehicleCrosstownDto);
         UserDTO userDTO = userInfoBiz.getAdminUserInfo();
         if (userDTO == null) {
             return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, "token is null or invalid");
@@ -164,7 +168,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         if (baseOrder == null) {
             return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
         }
-
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
         if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
             boolean flag = getTodayTime(orderRentVehicleDetail.getEndTime());
@@ -195,7 +198,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                     return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode(), ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc());
                 }
             }
-
         }
         AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
         //调用车辆管理的出车还车
@@ -255,15 +257,15 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             }
         }
         BigDecimal amount = new BigDecimal(cost.toString()).divide(new BigDecimal("1"), 2, BigDecimal.ROUND_UP);
-        orderVehicleCrosstownDto.setDeductionCost(amount);
-        //扣除费用
-        orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(orderVehicleCrosstownDto.getDeductionCost()));
-        if (orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
-            return ObjectRestResponse.createFailedResult(500, "押金不足，不能交车，请联系客服！");
-        }
         //出车成功后修改订单状态
         List<OrderVehicleCrosstownDto> oldValue = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
         if (oldValue.size() == 1) {
+            orderVehicleCrosstownDto.setDeductionCost(oldValue.get(0).getDeductionCost().add(amount));
+            //扣除费用
+            orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(orderVehicleCrosstownDto.getDeductionCost()));
+            if (orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
+                return ObjectRestResponse.createFailedResult(500, "押金不足，不能交车，请联系客服！");
+            }
             BeanUtil.copyProperties(orderVehicleCrosstownDto, oldValue.get(0), CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
             getOrderLicense(orderVehicleCrosstownDto);
             handleOrderStatus(baseOrder, orderRentVehicleDetail, oldValue.get(0));
@@ -274,6 +276,12 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             }
             return ObjectRestResponse.succ(oldValue.get(0));
         } else if (oldValue.size() <= 0) {
+            orderVehicleCrosstownDto.setDeductionCost(amount);
+            //扣除费用
+            orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(orderVehicleCrosstownDto.getDeductionCost()));
+            if (orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
+                return ObjectRestResponse.createFailedResult(500, "押金不足，不能交车，请联系客服！");
+            }
             getOrderLicense(orderVehicleCrosstownDto);
             orderVehicleCrosstownBiz.insertSelective(orderVehicleCrosstownDto);
             OrderVehicleCrosstown orderVehicleCrosstown = orderVehicleCrosstownBiz.selectOne(orderVehicleCrosstownDto);
@@ -289,75 +297,94 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     private void handleOrderStatus(BaseOrder baseOrder, OrderRentVehicleDetail orderRentVehicleDetail, OrderVehicleCrosstown orderVehicleCrosstown) {
         //交车完成 设置订单状态为出行中
-        BigDecimal totalAmount = new BigDecimal(0);
-        ObjectRestResponse<OrderPageVO> objectRestResponse = baseOrderBiz.getOrderDetail(baseOrder.getNo());
-        if (objectRestResponse.getData() != null && objectRestResponse.getData().getOrderRentVehicleDetail() != null) {
-            //总押金
-            totalAmount = objectRestResponse.getData().getOrderRentVehicleDetail().getDeposit();
-        }
-
+        BigDecimal totalAmount = orderRentVehicleDetail.getDeposit();
         if (baseOrder.getStatus() == OrderStatusEnum.ORDER_TOSTART.getCode()) {//交车
             baseOrder.setStatus(OrderStatusEnum.ORDER_WAIT.getCode());
             baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_WAIT.getCode()) { //还车
+            //提前还车,结束时间大于当前时间
+            DateTime nowTime = DateTime.parse(DateTime.now().toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER);
+            DateTime endTime = DateTime.parse(new DateTime(orderRentVehicleDetail.getEndTime()).toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER);
+            DateTime startTime = DateTime.parse(new DateTime(orderRentVehicleDetail.getStartTime()).toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER);
+            //实际预定的天数
+            int actualDay = getDaysBetweenDateTime(startTime, endTime);
+            if (orderRentVehicleDetail.getEndTime() > nowTime.getMillis()) {
+                //提前的天数, 当天就算使用一天
+                int noUsedDay = getDaysBetweenDateTime(nowTime, endTime) - 1;
+                //退还未使用的天数，或者金额，扣除违约金，实际未使用天数的金额，最多3000元
+                InProgressVO inProgressVO = orderCalculateBiz.inProgressCalculate(baseOrder, actualDay - noUsedDay);
+                if (inProgressVO != null) {
+                    baseOrder.setViolateAmount(inProgressVO.getViolateAmount());
+                    baseOrder.setExtraAmount(inProgressVO.getExtraAmount());
+                    if (inProgressVO.getBackCoupons() != null && inProgressVO.getBackCoupons().size() > 0) {
+                        StringBuilder backCoupons = new StringBuilder();
+                        inProgressVO.getBackCoupons().forEach((a) -> backCoupons.append(a + ","));
+                        baseOrder.setBackCoupon(backCoupons.toString());
+                    }
+                }
+                BigDecimal cost = new BigDecimal(0);
+                cost.add(inProgressVO.getExtraAmount()).add(inProgressVO.getViolateAmount());
+                updateCrossRefund(orderVehicleCrosstown, cost, OrderViolateEnum.BEFORE.getCode());
+                //延期还车,结束时间小于当前时间
+            } else if (orderRentVehicleDetail.getEndTime() < nowTime.getMillis()) {
+                //延期的天数, 延期违约金是延期天数*200%
+                int usedDay = getDaysBetweenDateTime(endTime, nowTime);
+                Integer orderId = baseOrder.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;
+                        }
+                    }
+                }
+                BigDecimal cost = amount.multiply(new BigDecimal(usedDay)).multiply(new BigDecimal(2));
+                updateCrossRefund(orderVehicleCrosstown, cost, OrderViolateEnum.AFTER.getCode());
+            }
+
             if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.ARRIVE.getCode()) {//不定损直接还车
                 //添加非定损记录
+                Integer orderId = baseOrder.getId();
+                List<OrderVehicleCrosstownDto> list = orderVehicleCrosstownBiz.selectByOrderId(new OrderVehicleCrosstownDto() {{
+                    setOrderId(orderId);
+                    setType(CrosstownTypeEnum.ARRIVE.getCode());
+                }});
+                if (list != null && list.size() > 0) {
+                    OrderVehicleCrosstownDto orderVehicleCrosstownDto = list.get(0);
+                    OrderVehicleCrosstown orderVehicleCrosstown1 = new OrderVehicleCrosstown();
+                    BeanUtil.copyProperties(orderVehicleCrosstownDto, orderVehicleCrosstown1, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+                    DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
+                    depositRefundRecord.setAmount(orderVehicleCrosstown.getDeductionCost());
+                    depositRefundRecord.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown1.getDeductionCost()));
+                    depositRefundRecord.setTotalAmount(totalAmount.subtract(getAmount()));
+                    depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
+                    orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
+                    //修改订单状态为已完成
+                    baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
+                    baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+                    //修改订单详情是否押金全部退还
+                    orderRentVehicleDetail.setFixedLossStatus(0);
+                    orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
+                    baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
+                }
+            } else if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //定损还车，添加定损记录
+                //添加定损记录
                 DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
                 depositRefundRecord.setAmount(orderVehicleCrosstown.getDeductionCost());
                 depositRefundRecord.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown.getDeductionCost()));
                 depositRefundRecord.setTotalAmount(totalAmount.subtract(getAmount()));
                 depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
-                orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
-                //修改订单状态为已完成
-                baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
-                baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
-                //修改订单详情是否押金全部退还
-                orderRentVehicleDetail.setFixedLossStatus(0);
+                orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
+                //修改訂單狀態為定損
+                baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
+                baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+                orderRentVehicleDetail.setFixedLossStatus(1);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
-                baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
-            } else if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //定损还车，添加定损记录
-                //提前还车,结束时间大于当前时间
-                DateTime nowTime = DateTime.now();
-                DateTime endTime = new DateTime(orderRentVehicleDetail.getEndTime());
-                DateTime startTime = new DateTime(orderRentVehicleDetail.getStartTime());
-                //实际预定的天数
-                int actualDay = getDaysBetweenDateTime(startTime, endTime);
-                if (orderRentVehicleDetail.getEndTime() > nowTime.getMillis()) {
-                    //提前的天数
-                    int noUsedDay = getDaysBetweenDateTime(nowTime, endTime);
-                    //退还未使用的天数，或者金额，扣除违约金，实际未使用天数的金额，最多3000元
-
-                    //延期还车,结束时间小于当前时间
-                } else if (orderRentVehicleDetail.getEndTime() < nowTime.getMillis()) {
-                    //延期的天数, 延期违约金是延期天数*200%
-                    int usedDay = getDaysBetweenDateTime(endTime, nowTime);
-                    DedDetailDTO dedDetailDTO = new DedDetailDTO();
-                    dedDetailDTO.setDeductions("违约金:");
-                    dedDetailDTO.setCost(baseOrder.getGoodsAmount().multiply(new BigDecimal(usedDay)).multiply(new BigDecimal(2)));
-                    dedDetailDTO.setId(1);
-                    dedDetailDTO.setStatusIndex(1);
-                    dedDetailDTO.setStatusName("延期违约金");
-                    dedDetailDTO.setType(3);
-                    orderVehicleCrosstown.setDedDetail(JSONObject.toJSONString(dedDetailDTO));
-                    BigDecimal restDeposit = orderVehicleCrosstown.getRestDeposit().subtract(dedDetailDTO.getCost());
-                    orderVehicleCrosstown.setRestDeposit(restDeposit);
-                    orderVehicleCrosstown.setDeductionCost(orderVehicleCrosstown.getDeductionCost().add(dedDetailDTO.getCost()));
-                    orderVehicleCrosstownBiz.updateSelectiveByIdRe(orderVehicleCrosstown);
-
-                }
             }
-            //添加定损记录
-            DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
-            depositRefundRecord.setAmount(orderVehicleCrosstown.getDeductionCost());
-            depositRefundRecord.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown.getDeductionCost()));
-            depositRefundRecord.setTotalAmount(totalAmount.subtract(getAmount()));
-            depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
-            orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
-            //修改訂單狀態為定損
-            baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
-            baseOrderBiz.updateSelectiveByIdReT(baseOrder);
-            orderRentVehicleDetail.setFixedLossStatus(1);
-            orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_FIXED_LOSS.getCode()) {//定损后还车
             DepositRefundRecord depositRefundRecord = orderDepositRefundRecordBiz.findByCrossIdAndStatus(orderVehicleCrosstown.getId(), DepositRefundStatus.FIXLOSSREFUND.getCode());
             if (depositRefundRecord != null) {
@@ -387,6 +414,29 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
     }
 
 
+    public void updateCrossRefund(OrderVehicleCrosstown orderVehicleCrosstown, BigDecimal cost, Integer type) {
+        DedDetailDTO dedDetailDTO = new DedDetailDTO();
+        String detailName = null;
+        if (type == OrderViolateEnum.BEFORE.getCode()) {
+            dedDetailDTO.setType(OrderViolateEnum.BEFORE.getCode());
+            detailName = "提前还车违约金";
+        } else if (type == OrderViolateEnum.AFTER.getCode()) {
+            dedDetailDTO.setType(OrderViolateEnum.AFTER.getCode());
+            detailName = "延期还车违约金";
+        }
+        dedDetailDTO.setDeductions(detailName);
+        dedDetailDTO.setCost(cost);
+        dedDetailDTO.setId(1);
+        dedDetailDTO.setStatusIndex(1);
+        dedDetailDTO.setStatusName(detailName);
+        orderVehicleCrosstown.setViolateDetail(JSONObject.toJSONString(dedDetailDTO));
+        BigDecimal restDeposit = orderVehicleCrosstown.getRestDeposit().subtract(dedDetailDTO.getCost());
+        orderVehicleCrosstown.setRestDeposit(restDeposit);
+        orderVehicleCrosstown.setDeductionCost(orderVehicleCrosstown.getDeductionCost().add(dedDetailDTO.getCost()));
+        orderVehicleCrosstownBiz.updateSelectiveByIdRe(orderVehicleCrosstown);
+    }
+
+
     //添加订单驾驶人信息
     public void getOrderLicense(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getLicenseIdCard())) {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

@@ -59,7 +59,6 @@ public class VehicleActiveService {
      * @param departureVo
      */
     public void departure(VehicleDepartureVo departureVo) {
-        try {
             Vehicle vehicle = vehicleMapper.selectByPrimaryKey(departureVo.getVehicleId());
             if (vehicle == null) {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
@@ -86,11 +85,9 @@ public class VehicleActiveService {
                 vehicle.setMileageLastUpdate(MileageLift1);
                 vehicle.setExpectDestinationBranchCompanyId(departureVo.getExpectArrivalBranchCompanyId());
                 vehicleMapper.updateByPrimaryKeySelective(vehicle);
-
                 // 修改车辆状态，确认是空闲状态
                 int result = vehicleMapper.updateStatusByIdAndStatus(departureVo.getVehicleId(), VehicleStatus.DEPARTURE.getCode(),
                         VehicleStatus.NORMAL.getCode());
-
                 if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
                     throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                             ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
@@ -133,9 +130,8 @@ public class VehicleActiveService {
                         departureLog.setUserTel(vehicleBookRecord.getVehicleUserPhone());
                     }
                     vehicleDepartureLogMapper.insert(departureLog);
+                    log.info("收车成功： 收车记录：departureLog = {}", departureLog.toString());
                 }
-
-
                 // 车辆活动日志
                 VehicleActiveLog activeLog = new VehicleActiveLog();
                 activeLog.setVehicleId(departureVo.getVehicleId());
@@ -147,10 +143,6 @@ public class VehicleActiveService {
                 throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                         ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
     }
 
 
@@ -202,10 +194,6 @@ public class VehicleActiveService {
                 throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
                         ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
             }
-//        if (!vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
-//            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
-//                    ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
-//        }
             Integer Mileagerest = vehicle.getMileageLastUpdate();
             Integer Mileagerest1 = arrivalVo.getMileage();
             if (Mileagerest1 == null) {
@@ -218,7 +206,6 @@ public class VehicleActiveService {
                     vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());
                     updateBookRecordStatus(vehicleBookRecord, 2);
                 }
-
                 // 写入车辆公里数,还车分公司id
                 vehicle.setMileageLastUpdate(Mileagerest1);
                 if (vehicleBookRecord != null) {
@@ -226,12 +213,8 @@ public class VehicleActiveService {
                 }
                 vehicle.setExpectDestinationBranchCompanyId(0);
                 vehicleMapper.updateByPrimaryKeySelective(vehicle);
-
-
-
                 // 出车记录
                 VehicleDepartureLogVo departureLogVo = vehicleDepartureLogMapper.selectByBookRecordId(arrivalVo.getBookRecordId());
-
                 if (departureLogVo == null) {
                     throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
                             ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
@@ -248,10 +231,6 @@ public class VehicleActiveService {
                 }
                 if(flag) { //如果此条记录后面还有未收车记录，就不修改车辆状态
                     int result = vehicleMapper.updateStatus(arrivalVo.getVehicleId(), VehicleStatus.NORMAL.getCode());
-//                if (result == 0) {
-//                    throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
-//                            ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
-//                }
                 }
 
                 DateTime arrivalDate = new DateTime(vehicleBookRecord.getBookEndDate());
@@ -298,23 +277,7 @@ public class VehicleActiveService {
                 activeLog.setEndTime(new Date());
                 activeLog.setUpdateTime(new Date());
                 vehicleActiveLogMapper.updateByPrimaryKeySelective(activeLog);
-
-                //取消预定时间 bookInfo和bookRecord
-//            BookVehicleVO bookVehicleVo = new BookVehicleVO();
-//            BeanUtils.copyProperties(vehicleBookRecord, bookVehicleVo);
-//            bookVehicleVo.setNotCheckTimeLegal(Boolean.TRUE);
-//            bookVehicleVo.setBookStartDate(null);
-//            bookVehicleVo.setBookEndDate(null);
-//            bookVehicleVo.setUnbookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DATE_TIME_FORMATTER));
-//            bookVehicleVo.setUnbookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DATE_TIME_FORMATTER));
-//           try {
-//               Boolean hasSuc = vehicleBiz.unbookVehicle(bookVehicleVo);
-//               if(!hasSuc){
-//                   throw new BaseException(ResCode.VEHICLE_UNBOOK_FAIL.getDesc(), ResCode.VEHICLE_UNBOOK_FAIL.getCode());
-//               }
-//           } catch ( Exception e) {
-//                e.printStackTrace();
-//           }
+                log.info("收车成功： 收车记录：departureLog = {}", departureLog.toString());
             } else {
                 throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                         ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());