Merge branch 'master-count-vehicle' into dev

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

 package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -8,12 +9,14 @@ import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 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;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
 import com.google.gson.JsonObject;
 import com.xxfc.platform.activity.feign.ActivityFeign;
@@ -39,6 +42,7 @@ import com.xxfc.platform.universal.feign.MQSenderFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
+import com.xxfc.platform.vehicle.entity.BookRecordUpdateLog;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
@@ -53,12 +57,10 @@ 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 tk.mybatis.mapper.entity.Example;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant.*;
@@ -72,7 +74,7 @@ import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
  */
 @Service
 @Slf4j
-public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
+public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements UserRestInterface {
 
     @Autowired
     OrderMemberDetailBiz orderMemberDetailBiz;
@@ -332,6 +334,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         dedDetailDTO.setStatusName(detailName);
     }
 
+    /**
+     * 获取驾驶人驾照
+     * @param orderPageVo
+     */
     public void getUserLicense(OrderPageVO orderPageVo) {
         OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
         orderVehicleCrosstownDto.setOrderId(orderPageVo.getId());
@@ -360,6 +366,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
     }
 
+    /**
+     *  获取驾驶人信息
+     * @param orderPageVo
+     */
     public void  getDriverInfo(OrderPageVO orderPageVo) {
         List<VehicleUserLicense> vehicleUserLicenses = Lists.newArrayList();
         String myDriverIds = orderPageVo.getOrderRentVehicleDetail().getMyDriverIds();
@@ -387,7 +397,57 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         orderPageVo.setVehicleUserLicenses(vehicleUserLicenses);
     }
 
+    public ObjectRestResponse save(OrderRentVehicleDetail orderRentVehicleDetail) {
+        if (orderRentVehicleDetail == null || orderRentVehicleDetail.getId() == null) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        log.info("更新订单还车地点》》》 orderRentVehicleDetail = {}", orderRentVehicleDetail.toString());
+        UserDTO userDTO = getAdminUserInfo();
+        if (userDTO == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
+        }
 
+        StringBuilder stringBuilder = new StringBuilder();
+        OrderRentVehicleDetail oldValue = orderRentVehicleBiz.selectById(orderRentVehicleDetail.getId());
+        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("; 原还车公司ID: ");
+        stringBuilder.append(oldValue.getEndCompanyId());
+        stringBuilder.append("; 更新后还车公司ID: ");
+        stringBuilder.append(orderRentVehicleDetail.getEndCompanyId());
+        stringBuilder.append("; 操作人ID：");
+        stringBuilder.append(userDTO.getId());
+        stringBuilder.append("; 操作人账号：");
+        stringBuilder.append(userDTO.getUsername());
+        //添加修改记录实体
+        BookRecordUpdateLog bookRecordUpdateLog = new BookRecordUpdateLog();
+        bookRecordUpdateLog.setBookRecordId(oldValue.getBookRecordId());
+        bookRecordUpdateLog.setOldRetCompanyId(oldValue.getEndCompanyId());
+        bookRecordUpdateLog.setNewRetCompanyId(orderRentVehicleDetail.getEndCompanyId());
+        bookRecordUpdateLog.setOperaterId(userDTO.getId());
+        bookRecordUpdateLog.setOperaterName(userDTO.getName());
+        bookRecordUpdateLog.setOrderId(oldValue.getOrderId());
+        bookRecordUpdateLog.setCreateTime(new Date());
+        BeanUtil.copyProperties(orderRentVehicleDetail, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+        oldValue.setEndCompanyId(orderRentVehicleDetail.getEndCompanyId());
+        orderRentVehicleBiz.updateSelectiveByIdRe(oldValue);
+        ObjectRestResponse objectRestResponse = vehicleFeign.update(bookRecordUpdateLog);
+        if (objectRestResponse!= null && objectRestResponse.getRel()) {
+            log.info(stringBuilder.toString());
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createFailedResult(1355, "修改失败！");
+    }
+
+
+    /**
+     * 获取订单详情，包含驾驶人信息，违约金等信息
+     * @param no
+     * @return
+     */
     public ObjectRestResponse<OrderPageVO> getOrderDetail(String no) {
         OrderPageVO orderPageVo = mapper.getOrderDetail(no);
         if (orderPageVo == null) {
@@ -641,6 +701,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         return query;
     }
 
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
     /**
      * 订单查询类
      */

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

@@ -172,7 +172,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
         if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
-            boolean flag = getTodayTime(orderRentVehicleDetail.getEndTime());
+            boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime());
             if (!flag) {
                 return ObjectRestResponse.createFailedResult(3502, "今日不是交车日期");
             }
@@ -433,9 +433,20 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     public boolean getTodayTime(Long time) {
         long current = System.currentTimeMillis();
-        if (current <= (time / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset()) + 24 * 60 * 60 * 1000 - 1) {
+        if (current <= (getDayStart(time) + 24 * 60 * 60 * 1000 - 1) && current >= getDayStart(time)) {
             return true;
         }
         return false;
     }
+
+    public static Long getDayStart(Long time) {
+        long current = time;
+        long zero = current / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
+        return zero;
+    }
+
+    public static void main(String[] args) {
+        StringBuffer stringBuffer = new StringBuffer("We Are Happy");
+    }
+
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -359,6 +359,13 @@ public class BackStageOrderController extends CommonBaseController implements Us
         return ObjectRestResponse.succ();
     }
 
+    @PostMapping("/updateEndCompany")
+    @ResponseBody
+    public ObjectRestResponse updateEndCompany(@RequestBody OrderRentVehicleDetail orderRentVehicleDetail) {
+        return baseOrderBiz.save(orderRentVehicleDetail);
+    }
+
+
     @Data
     public static class ChangeVehicleDTO {
         String no;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/BookRecordUpdateLog.java

+package com.xxfc.platform.vehicle.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Data
+@Table(name = "book_record_update_log")
+public class BookRecordUpdateLog {
+    @Id
+    private Integer id;
+
+    /**
+     * 订单ID
+     */
+    @Column(name = "order_id")
+    private Integer orderId;
+
+    /**
+     * 预定记录ID
+     */
+    @Column(name = "book_record_id")
+    private Long bookRecordId;
+
+    /**
+     * 原还车公司ID
+     */
+    @Column(name = "old_ret_company_id")
+    private Integer oldRetCompanyId;
+
+    /**
+     * 新还车公司ID
+     */
+    @Column(name = "new_ret_company_id")
+    private Integer newRetCompanyId;
+
+    /**
+     * 操作人ID
+     */
+    @Column(name = "operater_id")
+    private Integer operaterId;
+
+    /**
+     * 操作人姓名
+     */
+    @Column(name = "operater_name")
+    private String operaterName;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleCountRecord.java

@@ -72,6 +72,16 @@ public class VehicleCountRecord {
     )
     private Date countDate;
 
+    /**
+     * 无效数据数量（超过还车时间后还未出车的数据）
+     */
+    @Column(name = "no_use_num")
+    private Integer noUseNum;
+
+    @Column(name = "cancel_num")
+    private Integer cancelNum;
+
+
     @Transient
     private String startTime;
 

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

@@ -10,6 +10,7 @@ import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
 import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo;
 import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
 import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -163,4 +164,8 @@ public interface VehicleFeign {
 
     @GetMapping("/vehicleInfo/findVehicleIds")
     List<String> findbyPlateNumberAndVehicleCod(@RequestParam(value = "plateNumber") String plateNumber,@RequestParam(value = "vehicleCode") String vehicleCode);
+
+    @RequestMapping(value = "/vehicleInfo/bookRecord/update", method = RequestMethod.POST)
+    public ObjectRestResponse update(@RequestBody BookRecordUpdateLog bookRecordUpdateLog);
+
 }

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

+package com.xxfc.platform.vehicle.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.vehicle.entity.BookRecordUpdateLog;
+import com.xxfc.platform.vehicle.mapper.BookRecordUpdateLogMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BookRecordUpdateLogBiz extends BaseBiz<BookRecordUpdateLogMapper, BookRecordUpdateLog> {
+
+    public ObjectRestResponse save(BookRecordUpdateLog bookRecordUpdateLog) {
+        BookRecordUpdateLog oldValue = mapper.selectOne(bookRecordUpdateLog);
+        if (oldValue != null) {
+            return ObjectRestResponse.succ();
+        }
+        insertSelectiveRe(bookRecordUpdateLog);
+        return ObjectRestResponse.succ();
+    }
+
+}

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

@@ -78,6 +78,9 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     @Autowired
     VehicleDepartureService vehicleDepartureService;
 
+    @Autowired
+    BookRecordUpdateLogBiz bookRecordUpdateLogBiz;
+
     @Override
     public UserFeign getUserFeign() {
         return userFeign;
@@ -324,6 +327,21 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         return vehicleBookRecordVos;
     }
 
+    public ObjectRestResponse update(BookRecordUpdateLog bookRecordUpdateLog) {
+        VehicleBookRecord vehicleBookRecord = selectById(bookRecordUpdateLog.getBookRecordId());
+        if(vehicleBookRecord != null) {
+            vehicleBookRecord.setRetCompany(bookRecordUpdateLog.getNewRetCompanyId());
+            int a = updateSelectiveByIdRe(vehicleBookRecord);
+            log.info(vehicleBookRecord.toString());
+            if(a <= 0) {
+                return ObjectRestResponse.createDefaultFail();
+            }
+            return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);
+        } else {
+            return  ObjectRestResponse.createFailedResult(ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getCode(), ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getDesc());
+        }
+    }
+
     public ObjectRestResponse<List<VehicleBookRecordVo>> selectByIds(List<Long> ids) {
         Map<String, Object> map = new HashMap<>();
         map.put("ids", ids);
@@ -644,6 +662,10 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
 
     }
 
+    public List<VehicleBookRecordVo> selectAllCancelBookRecord(Map<String, Object> param) {
+        return mapper.selectAllCancelBookRecord(param);
+    }
+
 
     public PageDataVO<VehicleRecordInfoVo> getListByParam(VehiclePlanDto vehiclePlanDto) {
         Query query = new Query(vehiclePlanDto);

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

@@ -279,6 +279,24 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
             if(innerAfterArrivalNum != null && innerAfterArrivalNum > 0) {
                 innerCountRecord.setAfterArrivalNum(innerAfterArrivalNum);
             }
+            //在当前时间内已经取消的记录数
+            List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectAllCancelBookRecord(param);
+            if (vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
+                innerCountRecord.setCancelNum(vehicleBookRecordVos.size());
+            }
+            //过期未出车无效数据
+            param.put("startTime", DateTime.parse("1970-01-01 00:00:00", DATE_TIME_FORMATTER).toDate());
+            List<VehicleBookRecordVo> vehicleBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 2).getData();
+            if (vehicleBookRecordList != null && vehicleBookRecordList.size() > 0) {
+                Iterator<VehicleBookRecordVo> iterator = vehicleBookRecordList.iterator();
+                while (iterator.hasNext()) {
+                    if(iterator.next().getVehicleDepartureLogVo() != null) {
+                        iterator.remove();
+                    }
+                }
+                innerCountRecord.setNoUseNum(vehicleBookRecordList.size());
+            }
+
             innerCountRecord.setType(VehicleCountType.INNER.getCode());
             vehicleCountRecord.setCountDate(nowDate);
             tourCountRecord.setCountDate(nowDate);
@@ -323,6 +341,13 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
             vehicleCountRecord.setDepartureNum(vehicleDepartureList.size());
         }
         Map<String, Object> param = new HashMap<>();
+        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            startDate = simpleDateFormat1.format(startTime);
+            endDate = simpleDateFormat1.format(endTime);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         param.put("startTime", DateTime.parse(startDate, DATE_TIME_FORMATTER).toDate());
         param.put("endTime", DateTime.parse(endDate, DATE_TIME_FORMATTER).toDate());
         //1代表出车 2代表还车
@@ -330,6 +355,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
         param.put("bookUser", -2);
         //1代表正常出车，2代表提前出车，3代表延期出车
         param.put("type", 2);
+
         //租车提前出车数量
         Integer beforeDepartureNum = vehicleDepartureService.selectAllDepartureLog(param);
         if(beforeDepartureNum != null && beforeDepartureNum > 0) {
@@ -450,6 +476,24 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
             innerCountRecord.setAfterArrivalNum(innerAfterArrivalNum);
         }
         innerCountRecord.setType(VehicleCountType.INNER.getCode());
+        //在当前时间内已经取消的记录数
+        List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectAllCancelBookRecord(param);
+        if (vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
+            innerCountRecord.setCancelNum(vehicleBookRecordVos.size());
+        }
+        //过期未出车无效数据
+        param.put("startTime", DateTime.parse("1970-01-01 00:00:00", DATE_TIME_FORMATTER).toDate());
+        List<VehicleBookRecordVo> vehicleBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 2).getData();
+        if (vehicleBookRecordList != null && vehicleBookRecordList.size() > 0) {
+            Iterator<VehicleBookRecordVo> iterator = vehicleBookRecordList.iterator();
+            while (iterator.hasNext()) {
+                if(iterator.next().getVehicleDepartureLogVo() != null) {
+                    iterator.remove();
+                }
+            }
+            innerCountRecord.setNoUseNum(vehicleBookRecordList.size());
+        }
+
         vehicleCountRecord.setCountDate(nowDate);
         tourCountRecord.setCountDate(nowDate);
         innerCountRecord.setCountDate(nowDate);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/BookRecordUpdateLogMapper.java

+package com.xxfc.platform.vehicle.mapper;
+
+import com.xxfc.platform.vehicle.entity.BookRecordUpdateLog;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface BookRecordUpdateLogMapper extends Mapper<BookRecordUpdateLog> {
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBookRecordMapper.java

@@ -43,4 +43,6 @@ public interface VehicleBookRecordMapper extends Mapper<VehicleBookRecord> {
     public List<VehicleBookRecordVo> selectAllBookRecord(Map<String, Object> param);
 
     public List<VehicleBookRecordVo> selectByIds(Map<String, Object> param);
+
+    public List<VehicleBookRecordVo> selectAllCancelBookRecord(Map<String, Object> param);
 }
\ No newline at end of file

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

+package com.xxfc.platform.vehicle.rest;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.vehicle.biz.BookRecordUpdateLogBiz;
+import com.xxfc.platform.vehicle.entity.BookRecordUpdateLog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/bookRecord")
+public class BookRecordUpdateLogController {
+
+    @Autowired
+    BookRecordUpdateLogBiz bookRecordUpdateLogBiz;
+
+    @PostMapping(value = "/update")
+    public ObjectRestResponse save(@RequestBody BookRecordUpdateLog bookRecordUpdateLog) {
+        return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);
+    }
+}

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

@@ -20,9 +20,7 @@ import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
-import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.entity.Vehicle;
-import com.xxfc.platform.vehicle.entity.VehicleBookInfo;
+import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.jobhandler.VehicleJobHandler;
 import com.xxfc.platform.vehicle.pojo.*;
 import com.xxfc.platform.vehicle.pojo.dto.VehiclePlanDto;
@@ -38,6 +36,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -76,6 +75,10 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     @Autowired
     BranchCompanyBiz branchCompanyBiz;
 
+    @Autowired
+    BookRecordUpdateLogBiz bookRecordUpdateLogBiz;
+
+
     public UserFeign getUserFeign() {
         return userFeign;
     }
@@ -304,6 +307,35 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
 
     }
 
+    @RequestMapping(value = "/bookRecord/update", method = RequestMethod.POST)
+    @ApiOperation(value = "修改预定记录还车地点")
+    public ObjectRestResponse update(@RequestBody BookRecordUpdateLog bookRecordUpdateLog){
+        return vehicleBookRecordBiz.update(bookRecordUpdateLog);
+    }
+
+    @RequestMapping(value = "/bookRecord/updateById", method = RequestMethod.POST)
+    @ApiOperation(value = "修改预定记录还车地点")
+    public ObjectRestResponse updateById(@RequestBody VehicleBookRecord vehicleBookRecord){
+        VehicleBookRecord oldValue = vehicleBookRecordBiz.selectById(vehicleBookRecord.getId());
+        UserDTO userDTO = getAdminUserInfo();
+        if (userDTO == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
+        }
+        if(oldValue != null) {
+            oldValue.setRetCompany(vehicleBookRecord.getRetCompany());
+            BookRecordUpdateLog bookRecordUpdateLog = new BookRecordUpdateLog();
+            bookRecordUpdateLog.setBookRecordId(vehicleBookRecord.getId());
+            bookRecordUpdateLog.setOldRetCompanyId(vehicleBookRecord.getRetCompany());
+            bookRecordUpdateLog.setNewRetCompanyId(vehicleBookRecord.getRetCompany());
+            bookRecordUpdateLog.setOperaterId(userDTO.getId());
+            bookRecordUpdateLog.setOperaterName(userDTO.getName());
+            bookRecordUpdateLog.setCreateTime(new Date());
+            vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);
+            return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);
+        } else {
+            return  ObjectRestResponse.createFailedResult(ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getCode(), ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getDesc());
+        }
+    }
 
     @RequestMapping(value = "/bookedRecord", method = RequestMethod.GET)
     @ApiOperation(value = "获取多个预定记录")

xx-vehicle/xx-vehicle-server/src/main/resources/builder/generatorConfig.xml

@@ -37,7 +37,7 @@
 <!--        </table>-->
 <!--        <table tableName="branch_company_stock_info" domainObjectName="BranchCompanyStockInfo"></table>-->
 <!--        <table tableName="branch_company_stock_apply_info" domainObjectName="BranchCompanyStockApplyInfo"></table>-->
-        <table tableName="vehicle_count_record" domainObjectName="VehicleCountRecord"></table>
+        <table tableName="book_record_update_log" domainObjectName="BookRecordUpdateLog"></table>
 <!--        <table tableName="vehicle_upkeep_log" domainObjectName="VehicleUpkeepLog"></table>-->
     </context>
 </generatorConfiguration>
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BookRecordUpdateLogMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xxfc.platform.vehicle.mapper.BookRecordUpdateLogMapper" >
+
+</mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -526,6 +526,17 @@
             and v1.book_end_date between #{startTime} and #{endTime}
         </if>
     </select>
+
+    <!--获取所有已取消的预定记录-->
+    <select id="selectAllCancelBookRecord" resultMap="searchBookRecord" parameterType="Map">
+        select v1.* from vehicle_book_record v1
+        where v1.status in (4,6)
+        <if test="startTime != null">
+            and v1.book_start_date &lt; #{startTime} and v1.book_end_date &gt; #{endTime}
+        </if>
+        and book_user != -2
+    </select>
+
     <select id="selectByIds" resultMap="searchBookRecord" parameterType="Map">
         select v1.* from vehicle_book_record v1
         where v1.status not in (4,6,7,3)