Merge branch 'master-bug' into dev

# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java
#	xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookInfoMapper.xml

ace-common/src/main/resources/properties/resultcod.properties

@@ -106,9 +106,6 @@ USER_EXIST_CODE=5003
 ORG_INSERT_FAILED_CODE=6001
 6001=新增组织失败
 
-VEHICLE_NOT_=6001
-6001=新增组织失败
-
 ORG_UPDATE_FAILED_CODE=6002
 6002=更新组织信息失败
 

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

@@ -151,7 +151,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 }
                 if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
                     RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVO.getOrderRentVehicleDetail().getVehicleId());
-                    log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
+                    log.info("获取车辆信息返回消息：{}", restResponse.getData());
                     if (restResponse.getData() != null) {
                         orderPageVO.setVehicleNumberPlat(restResponse.getData().getNumberPlate());
                     }

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

@@ -164,21 +164,21 @@ public class VehicleActiveService {
         }
         List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
         if (vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
-            Iterator<VehicleBookRecordVo> iterator = vehicleBookRecordVos.iterator();
-            while (iterator.hasNext()) {
-                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() != 1) { //已经出车
-                    stringBuilder.append("中，使用人：");
-                    stringBuilder.append(vehicleBookRecordVo.getVehicleUsername());
-                    stringBuilder.append(" 使用人电话：");
-                    stringBuilder.append(vehicleBookRecordVo.getVehicleUserPhone());
-                    return stringBuilder.toString();
-                }
+        Iterator<VehicleBookRecordVo> iterator = vehicleBookRecordVos.iterator();
+        while (iterator.hasNext()) {
+            VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
+            if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() != 1) { //已经出车
+                stringBuilder.append("中，使用人：");
+                stringBuilder.append(vehicleBookRecordVo.getVehicleUsername());
+                stringBuilder.append(" 使用人电话：");
+                stringBuilder.append(vehicleBookRecordVo.getVehicleUserPhone());
+                return stringBuilder.toString();
             }
         }
+    }
         stringBuilder.append(", 请联系管理员修改车辆状态为正常状态");
         return stringBuilder.toString();
-    }
+}
 
     public void arrival(VehicleArrivalVo arrivalVo) {
         Vehicle vehicle = vehicleMapper.selectByPrimaryKey(arrivalVo.getVehicleId());

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

@@ -643,10 +643,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if (vehicleBookRecord == null) {
             return RestResponse.codeAndMessage(ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getCode(), ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getDesc());
         }
-//        //已通过审核的可以取消预定
-//        if (!VehicleBookRecordStatus.APPROVE.getCode().equals(vehicleBookRecord.getStatus())) {
-//            return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getCode());
-//        }
+        //已通过审核的可以取消预定
+        if (!VehicleBookRecordStatus.APPROVE.getCode().equals(vehicleBookRecord.getStatus())) {
+            return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getCode());
+        }
         //转换为相应取消预定参数
         BookVehicleVO bookVehicleVo = new BookVehicleVO();
         BeanUtils.copyProperties(bookVehicleVo, vehicleBookRecord);

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

@@ -195,7 +195,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         Query query = new Query(vehicleBookRecordQueryVo);
         if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 2) {
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
-            removeStatus2(list);
+            removeStatus5(list);
             PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
             getupKeeps(vehicleBookRecordVoPageInfo.getList());
             PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
@@ -206,22 +206,80 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
             return RestResponse.suc(vehicleBookRecordVoPageDataVO);
         }
+        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 7) { //已完成
+            vehicleBookRecordQueryVo.setStatus(2);
+            Query query =  new Query(vehicleBookRecordQueryVo);
+            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
+            removeStatus7(list);
+            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
+            getupKeeps(vehicleBookRecordVoPageInfo.getList());
+            PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
+            vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
+            vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
+            vehicleBookRecordVoPageDataVO.setTotalCount((long) vehicleBookRecordVoPageInfo.getList().size());
+            vehicleBookRecordVoPageDataVO.setTotalPage((vehicleBookRecordVoPageInfo.getList().size() + pageSize - 1) / pageSize);
+            vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
+            return RestResponse.suc(vehicleBookRecordVoPageDataVO);
+        }
+        Query query =  new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
         getupKeeps(pageDataVO.getData());
         return RestResponse.suc(pageDataVO);
     }
 
+    //筛选未出车的记录
     public void removeStatus2(List<VehicleBookRecordVo> list) {
         if (list != null && list.size() > 0) {
             Iterator<VehicleBookRecordVo> iterator = list.iterator();
             while (iterator.hasNext()) {
-                if (iterator.next().getVehicleDepartureLogVo() != null) {
+                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
+                if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null) {
+                    iterator.remove();
+                }
+            }
+        }
+    }
+
+    //筛选未出车的记录
+    public void removeStatus3(List<VehicleBookRecordVo> list) {
+        if (list != null && list.size() > 0) {
+            Iterator<VehicleBookRecordVo> iterator = list.iterator();
+            while (iterator.hasNext()) {
+                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
+                if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null) {
                     iterator.remove();
                 }
+                vehicleBookRecordVo.setState(3);
             }
         }
     }
 
+    //筛选已出车未还车记录
+    public void removeStatus5(List<VehicleBookRecordVo> list) {
+        if (list != null && list.size() > 0) {
+            Iterator<VehicleBookRecordVo> iterator = list.iterator();
+            while (iterator.hasNext()) {
+                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
+                if (vehicleBookRecordVo.getVehicleDepartureLogVo() == null || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() ==1)) {
+                    iterator.remove();
+                }
+                vehicleBookRecordVo.setState(5);
+            }
+        }
+    }
+    //筛选已完成记录
+    public void removeStatus7(List<VehicleBookRecordVo> list) {
+        if (list != null && list.size() > 0) {
+            Iterator<VehicleBookRecordVo> iterator = list.iterator();
+            while (iterator.hasNext()) {
+                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
+                if (vehicleBookRecordVo.getVehicleDepartureLogVo() == null || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() !=1)) {
+                    iterator.remove();
+                }
+                vehicleBookRecordVo.setState(5);
+            }
+        }
+    }
     /**
      * 获取随身物品
      */

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

@@ -42,8 +42,7 @@
             </when>
           </choose>
 
-    where
-          vehicle = #{vehicleId} and `year_month`=#{yearMonth}
+    where vehicle = #{vehicleId} and `year_month`=#{yearMonth}
   </update>
     <update id="updateById" parameterType="com.xxfc.platform.vehicle.entity.VehicleBookInfo">
          update vehicle_book_info set