Merge remote-tracking branch 'origin/dev' into dev

ace-common/src/main/java/com/github/wxiaoqi/security/common/config/global/GlobalBasicConfiguration.java

 package com.github.wxiaoqi.security.common.config.global;
 
+import com.github.wxiaoqi.security.common.handler.GlobalExceptionHandler;
+import com.github.wxiaoqi.security.common.handler.PlatformExceptionHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.Environment;
 
 
@@ -13,6 +17,17 @@ public class GlobalBasicConfiguration implements ApplicationRunner{
 	private static Logger log = LoggerFactory.getLogger(GlobalBasicConfiguration.class);
 	private static Environment env;
 
+	@Bean
+	@ConditionalOnMissingBean
+	private GlobalExceptionHandler addGlobalExceptionHandler() {
+		return new GlobalExceptionHandler();
+	}
+	@Bean
+	@ConditionalOnMissingBean
+	private PlatformExceptionHandler addPlatformExceptionHandler() {
+		return new PlatformExceptionHandler();
+	}
+
 	@Autowired
 	private void setEnv(Environment env) {
 		GlobalBasicConfiguration.env = env;

ace-common/src/main/java/com/github/wxiaoqi/security/common/filter/AcceptFilter.java

@@ -7,7 +7,7 @@ import ch.qos.logback.core.spi.FilterReply;
 public class AcceptFilter extends Filter<ILoggingEvent> {
 	@Override
 	public FilterReply decide(ILoggingEvent event) {
-		if(event.getLoggerName().startsWith("com.xxfc.platform") || event.getLoggerName().startsWith("com.github.wxiaoqi")) {
+		if(event.getLoggerName().startsWith("com.xxfc.platform") || event.getLoggerName().startsWith("com.github.wxiaoqi") || event.getLoggerName().contains("Exception")) {
 			return FilterReply.ACCEPT;
 		} else {
 			return FilterReply.DENY;

ace-common/src/main/java/com/github/wxiaoqi/security/common/filter/DenyFilter.java

@@ -7,7 +7,7 @@ import ch.qos.logback.core.spi.FilterReply;
 public class DenyFilter extends Filter<ILoggingEvent> {
 	@Override
 	public FilterReply decide(ILoggingEvent event) {
-		if (event.getLoggerName().startsWith("com.alibaba.nacos") || event.getLoggerName().startsWith("com.xxfc.platform") || event.getLoggerName().startsWith("com.github.wxiaoqi")) {
+		if (event.getLoggerName().startsWith("com.alibaba.nacos") || event.getLoggerName().startsWith("com.xxfc.platform") || event.getLoggerName().startsWith("com.github.wxiaoqi") || event.getLoggerName().contains("Exception")) {
 				return FilterReply.DENY;
 		} else {
 			return FilterReply.ACCEPT;

ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/PlatformExceptionHandler.java

@@ -3,10 +3,13 @@ package com.github.wxiaoqi.security.common.handler;
 
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 @RestControllerAdvice("com.xxfc.platform")
+@Slf4j
 public class PlatformExceptionHandler {
 
     @ExceptionHandler(value = {BaseException.class})
@@ -18,4 +21,25 @@ public class PlatformExceptionHandler {
         return new BaseResponse(400,e.getMessage());
     }
 
+    //服务器异常
+    @ExceptionHandler(Exception.class)
+    public ObjectRestResponse<?> exceptionHandler(Exception e){
+        Throwable cause = e.getCause();
+        if(cause != null && cause.toString().contains("Exception")) {
+            log.error(cause.getMessage(), e);
+            return assembleResult(ObjectRestResponse.createFailedResult(5000, "服务器开小差了，请稍后重试！"), "Server exception: " + e.getMessage());
+        }
+        log.error("Server exception: ", e);
+        return assembleResult(ObjectRestResponse.createFailedResult(5000, "服务器开小差了，请稍后重试！"), "Server exception: " + e.getMessage());
+    }
+
+    protected ObjectRestResponse<?> assembleResult(ObjectRestResponse<?> error, String msg) {
+        log.debug("Exception: " + msg);
+        return error;
+    }
+
+    protected ObjectRestResponse<?> assembleResult(ObjectRestResponse<?> error, Throwable e) {
+        return assembleResult(error, e.getClass().getSimpleName() + ": " + e.getMessage());
+    }
+
 }

ace-common/src/main/java/com/github/wxiaoqi/security/common/log/Impl/CommonLogServiceImpl.java

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.common.log.entity.LogEntity;
 import com.github.wxiaoqi.security.common.log.entity.XxLogEntity;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +26,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 @Service
+@Slf4j
 public class CommonLogServiceImpl implements CommonLogService {
 
     @Value("${spring.application.name}")
@@ -86,6 +88,9 @@ public class CommonLogServiceImpl implements CommonLogService {
         }
         @Override
         public void run() {
+            if(!xxLogEntity.getServletPath().contains("/vehicleInfo/app/unauth/getVehiclePlanList")) {
+                log.info("用户请求信息：xxLogEntity = {}", xxLogEntity.toString());
+            }
             mongoTemplate.insert(xxLogEntity, xxLogEntity.getMongoKey());
         }
     }

ace-common/src/main/java/com/github/wxiaoqi/security/common/log/entity/XxLogEntity.java

@@ -14,13 +14,13 @@ import java.util.Date;
 public class XxLogEntity implements Serializable {
 
     private String app;
+    private String method;
+    private String createDate;
     private String servletPath;
+    private String requestPath;
     private String requestData;
     private String responseData;
-    private String createDate;
     private String endDate;
-    private String requestPath;
-    private String method;
     private String mongoKey;
 
     public XxLogEntity() {

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java

@@ -25,6 +25,7 @@ import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.lang.reflect.InvocationTargetException;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -257,4 +258,10 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
     }
 
 
+    public void deleteByUserIds(Collection<Integer> userIds) {
+        Example example = new Example(BaseUserMember.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andIn("userId",userIds);
+        mapper.deleteByExample(example);
+    }
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletBiz.java

@@ -364,4 +364,10 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> {
         return  ObjectRestResponse.succ();
   }
 
+    public void deleteByUserIds(Collection<Integer> userIds) {
+        Example example =new Example(MyWallet.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andIn("userId",userIds);
+        mapper.deleteByExample(example);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletCathBiz.java

@@ -126,4 +126,11 @@ public class MyWalletCathBiz extends BaseBiz<MyWalletCathMapper, MyWalletCath> {
     public WalletCathSumDto sumCathAmount(Integer userId,Integer type){
         return  mapper.sumCathAmount(userId,type);
     }
+
+    public void deleteByUserIds(Collection<Integer> userIds) {
+        Example example = new Example(MyWalletCath.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andIn("userId",userIds);
+        mapper.deleteByExample(example);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBiz.java

@@ -76,7 +76,7 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
             if(query.entrySet().size()>0) {
                 Example.Criteria criteria = example.createCriteria();
                 for (Map.Entry<String, Object> entry : query.entrySet()) {
-                    criteria.andLike(entry.getKey(), "%" + entry.getValue().toString() + "%");
+                    criteria.orLike(entry.getKey(), "%" + entry.getValue().toString() + "%");
                 }
             }
             example.createCriteria().andGreaterThan("id",1);
@@ -88,7 +88,7 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
             if(query.entrySet().size()>0) {
                 Example.Criteria criteria = example.createCriteria();
                 for (Map.Entry<String, Object> entry : query.entrySet()) {
-                    criteria.andLike(entry.getKey(), "%" + entry.getValue().toString() + "%");
+                    criteria.orLike(entry.getKey(), "%" + entry.getValue().toString() + "%");
                 }
             }
             if(StringUtils.isNotBlank(currentUser.getDataCompany())){

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java

@@ -9,7 +9,6 @@ import com.github.wxiaoqi.security.admin.dto.AppUserManageDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserManage;
 import com.github.wxiaoqi.security.admin.entity.User;
-import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserManageVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
@@ -17,16 +16,11 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * app用户管理类

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/DataController.java

 package com.github.wxiaoqi.security.admin.rest;
 
-import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
-import com.github.wxiaoqi.security.admin.biz.AppUserLoginBiz;
-import com.github.wxiaoqi.security.admin.biz.AppUserRelationBiz;
-import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
+import com.github.wxiaoqi.security.admin.biz.*;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.activity.feign.ActivityFeign;
+import com.xxfc.platform.order.feign.OrderFeign;
+import lombok.RequiredArgsConstructor;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.PostConstruct;
 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * @author libin
@@ -22,42 +24,55 @@ import java.util.*;
  * @description
  * @data 2019/7/24 15:11
  */
-@ConditionalOnProperty(prefix = "data.clean", name = "enable",havingValue = "true")
+@ConditionalOnProperty(prefix = "data.clean", name = "enable", havingValue = "true")
+@RequiredArgsConstructor(onConstructor = @__({@Autowired}))
 @RestController
 @RequestMapping("/app/unauth/user_data")
 public class DataController {
 
-    @PostConstruct
-    public void init(){
-        System.out.println("启动了****************************");
-    }
+    private final AppUserLoginBiz appUserLoginBiz;
+
+    private final AppUserDetailBiz appUserDetailBiz;
+
+    private final AppUserRelationBiz appUserRelationBiz;
+
+    private final AppUserSellingWaterBiz appUserSellingWaterBiz;
+
+    private final ActivityFeign activityFeign;
 
-    @Autowired
-    private AppUserLoginBiz appUserLoginBiz;
+    private final MyWalletBiz walletBiz;
 
-    @Autowired
-    private AppUserDetailBiz appUserDetailBiz;
+    private final MyWalletCathBiz walletCathBiz;
 
-    @Autowired
-    private AppUserRelationBiz appUserRelationBiz;
+    private final BaseUserMemberBiz userMemberBiz;
 
-    @Autowired
-    private AppUserSellingWaterBiz appUserSellingWaterBiz;
+    private final OrderFeign orderFeign;
 
-    @Autowired
-    private ActivityFeign activityFeign;
 
     @GetMapping("/clearwithphone")
     public ObjectRestResponse<Void> clearData(@RequestParam("phones") List<String> phons) {
 
         Map<String, Integer> phoneAndUserIdMapByPhones = appUserLoginBiz.findPhoneAndUserIdMapByPhones(phons);
-        if (Objects.nonNull(phoneAndUserIdMapByPhones)){
+        if (Objects.nonNull(phoneAndUserIdMapByPhones)) {
             Collection<Integer> userIds = phoneAndUserIdMapByPhones.values();
+            //1.删除登录表信息
             appUserLoginBiz.deleteByPhones(phons);
+            //2.删除用户详情信息
             appUserDetailBiz.deleteByUserIds(userIds);
+            //3.删除用户关系表信息
             appUserRelationBiz.deleteByMemberIds(userIds);
+            //4.删除用户钱包
+            walletBiz.deleteByUserIds(userIds);
+            //5.删除用户提现记录
+            walletCathBiz.deleteByUserIds(userIds);
+            //6.删除会员信息
+            userMemberBiz.deleteByUserIds(userIds);
+            //7.删除佣金数据
             appUserSellingWaterBiz.deleteByMemberIds(userIds);
-            activityFeign.clearDate(new ArrayList<>(userIds));
+            //8.清除活动和用户优惠券信息
+            activityFeign.clearDate(new ArrayList(userIds));
+            //9.消除租车订单与旅游订单信息
+//            orderFeign.clearDateByUserIds(new ArrayList(userIds));
         }
         return ObjectRestResponse.succ();
     }
@@ -66,7 +81,7 @@ public class DataController {
     public ObjectRestResponse<Void> clearRelationphone(@RequestParam("phones") List<String> phons) {
 
         Map<String, Integer> phoneAndUserIdMapByPhones = appUserLoginBiz.findPhoneAndUserIdMapByPhones(phons);
-        if (Objects.nonNull(phoneAndUserIdMapByPhones)){
+        if (Objects.nonNull(phoneAndUserIdMapByPhones)) {
             Collection<Integer> userIds = phoneAndUserIdMapByPhones.values();
             appUserRelationBiz.deleteByMemberIds(userIds);
             appUserSellingWaterBiz.deleteByMemberIds(userIds);

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/AppVersionBiz.java

@@ -5,18 +5,11 @@ import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.constant.RestCode;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.util.EntityUtils;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.xxfc.platform.app.vo.appVersionQuery;
-import com.xxfc.platform.vehicle.common.RestResponse;
-import com.xxfc.platform.vehicle.constant.RedisKey;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.session.RowBounds;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -32,18 +25,13 @@ import com.xxfc.platform.app.entity.AppVersion;
 import com.xxfc.platform.app.mapper.AppVersionMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.io.File;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppVersionController.java

@@ -4,37 +4,18 @@ import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.constant.AppFormat;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
-import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
-import com.github.wxiaoqi.security.common.util.Query;
-import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.app.biz.AppVersionBiz;
 import com.xxfc.platform.app.entity.AppVersion;
-import com.xxfc.platform.app.entity.Cofig;
 import com.xxfc.platform.app.vo.appVersionQuery;
-import com.xxfc.platform.vehicle.common.RestResponse;
-import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Delete;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
 @RestController
 @RequestMapping("version")

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

@@ -94,12 +94,12 @@ public class OrderTourVerificationBiz{
 
         // 出发时间 是否已经发车
         Date departureDate = tourFeign.selectDepartureDataBySpeId(tourDetail.getSpePriceId());
-        Long departureTime = tourFeign.selectDepartureTimeByStartCompanyIdAndRouteId(tourDetail.getStartCompanyId(), tourDetail.getGoodId());
+        //Long departureTime = tourFeign.selectDepartureTimeByStartCompanyIdAndRouteId(tourDetail.getStartCompanyId(), tourDetail.getGoodId());
         Integer departureStatus = tourFeign.selectDepartureStatusByVerificationId(verificationId);
-        LocalTime localDepartureTime = LocalTime.ofSecondOfDay(departureTime);
-        departureDate.setHours(localDepartureTime.getHour());
-        departureDate.setMinutes(localDepartureTime.getMinute());
-        departureDate.setSeconds(localDepartureTime.getSecond());
+        //LocalTime localDepartureTime = LocalTime.ofSecondOfDay(departureTime);
+        departureDate.setHours(0);
+        departureDate.setMinutes(0);
+        departureDate.setSeconds(0);
 
         if (Instant.now().toEpochMilli()<departureDate.toInstant().toEpochMilli()){
             return ObjectRestResponse.createFailedResultWithObj(400,"还未到发车时间",0);

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

@@ -204,7 +204,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             vehicleDepartureVo.setExpectArrivalBranchCompanyId(orderRentVehicleDetail.getEndCompanyId());
             vehicleDepartureVo.setMileage(orderVehicleCrosstownDto.getMileage());
             vehicleDepartureVo.setUse("用户租车");
-            vehicleDepartureVo.setBookRecordId(Integer.parseInt(orderRentVehicleDetail.getBookRecordId() + ""));
+            vehicleDepartureVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
             vehicleDepartureVo.setUser(userDTO.getUsername());
             vehicleDepartureVo.setUserTel(userDTO.getTelPhone());
             vehicleDepartureVo.setCheckMan(orderVehicleCrosstownDto.getLicenseName());

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordVo.java

@@ -33,7 +33,11 @@ public class VehicleBookRecordVo extends VehicleBookRecord {
     private Integer liftStatus;
 
     private Integer retStatus;
+
     private Integer state;
+
+    private Integer code;
+
     List<VehicleUpkeepItem> vehicleUpkeepItems;
 
 }

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

@@ -118,6 +118,7 @@ public class VehicleActiveService {
                departureLog.setBookRecordId(departureVo.getBookRecordId());
                departureLog.setDepartureRemark(departureVo.getRemark());
                if(vehicleBookRecord != null) {
+                   departureLog.setDepartureBranchCompanyId(vehicleBookRecord.getLiftCompany());
                    departureLog.setUse(BookType.getByCode(vehicleBookRecord.getBookType()));
                    departureLog.setUser(vehicleBookRecord.getVehicleUsername());
                    departureLog.setUserTel(vehicleBookRecord.getVehicleUserPhone());
@@ -191,10 +192,15 @@ public class VehicleActiveService {
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
         if (Mileagerest != null && Mileagerest1 >= Mileagerest) {
+            VehicleBookRecord vehicleBookRecord = null;
+            if(arrivalVo.getBookRecordId() != null) {
+                vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());
+                updateBookRecordStatus(vehicleBookRecord, 2);
+            }
 
             // 写入车辆公里数,还车分公司id
             vehicle.setMileageLastUpdate(Mileagerest1);
-            vehicle.setParkBranchCompanyId(arrivalVo.getArrivalBranchCompanyId());
+            vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
             vehicle.setExpectDestinationBranchCompanyId(0);
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
 
@@ -205,11 +211,6 @@ public class VehicleActiveService {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
                         ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
             }
-            VehicleBookRecord vehicleBookRecord = null;
-            if(arrivalVo.getBookRecordId() != null) {
-                vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());
-                updateBookRecordStatus(vehicleBookRecord, 2);
-            }
 
 
             // 出车记录

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

@@ -400,7 +400,7 @@
             parameterType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordQueryVo">
         select bc3.name parkCompanyName,bc4.name subordinateBranchName, conv(v4.booked_hour,10,2)
         startHour,conv(v5.booked_hour,10,2) endHour, bc1.`name` lift_company_name, bc2.`name` ret_company_name,
-        v3.number_plate,v1.*
+        v3.number_plate,v1.*,v3.code
         from vehicle_book_record v1
         LEFT JOIN vehicle_book_hour_info v4 on v4.book_record_id = v1.id and YEAR(v4.year_month_day) =
         YEAR(v1.book_start_date) AND MONTH(v4.year_month_day) = MONTH(v1.book_start_date) AND DAY(v4.year_month_day)
@@ -421,6 +421,9 @@
             <if test="numberPlate != null">
                 and v3.number_plate = #{numberPlate}
             </if>
+            <if test="code != null">
+                and v3.code = #{code}
+            </if>
             <if test="bookType != null">
                 and v1.book_type = #{bookType}
             </if>
@@ -444,7 +447,7 @@
     <select id="getBookRecordInfo" resultMap="searchBookRecord" parameterType="java.util.Map">
         select  (CASE v1.lift_company WHEN #{userCompany} THEN 1 ELSE 0 end) liftStatus,(CASE v1.ret_company WHEN
         #{userCompany} THEN 1 ELSE 0 end) retStatus,bc4.name subordinateBranchName, bc1.`name` lift_company_name,
-        bc2.`name` ret_company_name, v3.number_plate,v1.*
+        bc2.`name` ret_company_name, v3.number_plate,v1.*,v3.code
         from vehicle_book_record v1
         LEFT JOIN branch_company bc1 ON v1.lift_company = bc1.id
         LEFT JOIN branch_company bc2 on v1.ret_company = bc2.id
@@ -482,6 +485,9 @@
             <if test="status != null and status == -1 ">
                 and v4.state = 1
             </if>
+            <if test="code != null">
+                and v3.code = #{code}
+            </if>
             and v1.book_user != -2
         </where>
         group by v1.id