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

.gitignore

@@ -10,7 +10,7 @@ ace-modules/ace-tool/src/main/resources/application-dev.yml
 **/src/test
 **/logs
 xx-order/xx-order-server/logs/**
-xx-order/xx-order-server/src/test/java/**
+xx-order/xx-order-server/src/test/**
 *.log
 logs/**
 /src/main/test/**

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

@@ -40,6 +40,15 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
     private Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
     @Value("${spring.application.name}")
     private String applicationName;
+
+    @Value("${email.log.account}")
+    private  String emailLogAccount;
+
+    @Value("${email.log.title}")
+    private String emailLogTitle;
+
+    @Value("${email.log.host}")
+    private String emailLogHost;
     /**
      * 在controller里面内容执行之前，校验一些参数不匹配啊，Get post方法不对啊之类的
      */
@@ -77,15 +86,6 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
         if(0 == ex.getStatus()) {
             response.setStatus(500);
         }
-        Map<String, String> map = new HashMap<>();
-        map.put("toUser", "jiaoruizhen@126.com");
-        map.put("subject", "服务器异常");
-        map.put("content", ex.toString() + ":" +ex.getMessage());
-        try {
-            HttpUtils.doPost("http://10.5.52.3:8765","/api/universal/mail/app/unauth/send", map);
-        } catch (Exception e) {
-            logger.error(e.getMessage());
-        }
         return new BaseResponse(ex.getStatus(), ex.getMessage());
     }
 
@@ -99,22 +99,22 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
             cause.printStackTrace(new PrintWriter(stringWriter));
             logger.error(cause.getMessage(), ex);
             Map<String, String> map = new HashMap<>();
-            map.put("toUser", "jiaoruizhen@126.com");
-            map.put("subject", "服务器异常");
+            map.put("toUser", emailLogAccount);
+            map.put("subject", emailLogTitle);
             map.put("content", initCommonLogPrePart()+ ":" +stringWriter.toString());
             try {
-                HttpUtils.doPost("http://10.5.52.3:8765","/api/universal/mail/app/unauth/send", map);
+                HttpUtils.doPost(emailLogHost,"/api/universal/mail/app/unauth/send", map);
             } catch (Exception e) {
                 logger.error(e.getMessage());
             }
             return new BaseResponse(5000, "Server exception: " + ex.getMessage());
         }
         Map<String, String> map = new HashMap<>();
-        map.put("toUser", "jiaoruizhen@126.com");
-        map.put("subject", "服务器异常");
+        map.put("toUser", emailLogAccount);
+        map.put("subject", emailLogTitle);
         map.put("content", initCommonLogPrePart()+ ":" + ex.toString() + ":" + ex.getMessage());
         try {
-            HttpUtils.doPost("http://10.5.52.3:8765","/api/universal/mail/app/unauth/send", map);
+            HttpUtils.doPost(emailLogHost,"/api/universal/mail/app/unauth/send", map);
         } catch (Exception e) {
             logger.error(e.getMessage());
         }

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

@@ -26,6 +26,15 @@ public class PlatformExceptionHandler {
     @Value("${spring.application.name}")
     private String applicationName;
 
+    @Value("${email.log.account}")
+    private  String emailLogAccount;
+
+    @Value("${email.log.title}")
+    private String emailLogTitle;
+
+    @Value("${email.log.host}")
+    private String emailLogHost;
+
     @ExceptionHandler(value = {BaseException.class})
     public BaseResponse baseExceptionHandler(Exception e) {
         if (e instanceof BaseException){
@@ -45,11 +54,11 @@ public class PlatformExceptionHandler {
             cause.printStackTrace(new PrintWriter(stringWriter));
             log.error(cause.getMessage(), e);
             Map<String, String> map = new HashMap<>();
-            map.put("toUser", "jiaoruizhen@126.com");
-            map.put("subject", "服务器异常");
+            map.put("toUser", emailLogAccount);
+            map.put("subject", emailLogTitle);
             map.put("content", initCommonLogPrePart()+ ":" +stringWriter.toString());
             try {
-                HttpUtils.doPost("http://10.5.52.3:8765","/api/universal/mail/app/unauth/send", map);
+                HttpUtils.doPost(emailLogHost,"/api/universal/mail/app/unauth/send", map);
             } catch (Exception ex) {
                 log.error(ex.getMessage());
             }
@@ -57,11 +66,11 @@ public class PlatformExceptionHandler {
         }
         log.error("Server exception: ", e);
         Map<String, String> map = new HashMap<>();
-        map.put("toUser", "jiaoruizhen@126.com");
-        map.put("subject", "服务器异常");
+        map.put("toUser", emailLogAccount);
+        map.put("subject", emailLogTitle);
         map.put("content", initCommonLogPrePart()+ ":" + e.toString() + ":" + e.getMessage());
         try {
-            HttpUtils.doPost("http://10.5.52.3:8765","/api/universal/mail/app/unauth/send", map);
+            HttpUtils.doPost(emailLogHost,"/api/universal/mail/app/unauth/send", map);
         } catch (Exception ex) {
             log.error(ex.getMessage());
         }
@@ -83,7 +92,6 @@ public class PlatformExceptionHandler {
         HttpServletRequest request = servletRequestAttributes.getRequest();//获取request
         StringBuilder stringBuilder = new StringBuilder();
         //request 获得头部
-        stringBuilder.append(request.getHeader("app"));
         LocalDateTime startTime= LocalDateTime.now();//开始时间
         stringBuilder.append("》》" +startTime.toString());
         stringBuilder.append("》》" +request.getServletPath());
@@ -91,4 +99,5 @@ public class PlatformExceptionHandler {
         return stringBuilder.toString();
     }
 
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/UserMemberSaveDTO.java

@@ -36,4 +36,11 @@ public class UserMemberSaveDTO {
      */
     @ApiModelProperty(value = "剩余天数")
     private Integer rentFreeDays;
+
+
+    /**
+     *  剩余天数
+     */
+    @ApiModelProperty(value = "剩余天数")
+    private Integer source;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberExport.java

 package com.github.wxiaoqi.security.admin.entity;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import javax.persistence.Column;
 import javax.persistence.Table;
@@ -20,6 +17,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Table(name = "base_user_member_export")
+@ToString
 public class BaseUserMemberExport  implements Serializable {
     private static final long serialVersionUID = 1L;
     private Integer id;
@@ -42,5 +40,12 @@ public class BaseUserMemberExport  implements Serializable {
     private Integer crtId;
     @Column(name = "member_name")
     private String memberName;
+    @Column(name = "before_membe_level")
+    private Integer beforeMemberLevel;
+    @Column(name = "before_discount")
+    private Integer beforeDiscount;
+    @Column(name = "source")
+    private Integer source;
 
 }
+

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

@@ -4,18 +4,20 @@ import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
 import com.github.wxiaoqi.security.admin.dto.BaseUserMemberVO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberExport;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
+import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Service;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberMapper;
@@ -23,12 +25,14 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.weekend.WeekendSqls;
 
+import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.InvocationTargetException;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * 用户会员表
@@ -43,11 +47,26 @@ import java.util.List;
 public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMember> {
 
     @Autowired
-    AppUserDetailBiz detailBiz;
+    private AppUserDetailBiz detailBiz;
 
     @Autowired
     private BaseUserMemberLevelMapper BaseUserMemberLevelMapper;
 
+    @Autowired
+    private AppUserLoginBiz appUserLoginBiz;
+
+    private  ExecutorService executorService = Executors.newCachedThreadPool();
+
+    @Autowired
+    private UserAuthUtil userAuthUtil;
+
+    @Autowired
+    private UserAuthConfig userAuthConfig;
+
+
+    @Autowired
+    private BaseUserMemberExportBiz baseUserMemberExportBiz;
+
 //    @Autowired
 //    private TaskExecutor taskExecutor;
 //
@@ -224,7 +243,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
      * @param userMemberDTO
      */
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void UpdateUserMember(UserMemberDTO userMemberDTO) throws InvocationTargetException, IllegalAccessException {
+    public void UpdateUserMember(UserMemberDTO userMemberDTO,HttpServletRequest request) throws Exception {
 
         Integer userId = userMemberDTO.getUserId();
         BaseUserMember baseUserMember = new BaseUserMember();
@@ -234,7 +253,6 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
         if (totalNumber < freeDays) {
             freeDays = totalNumber;
         }
-
         if (userMemberDTO.getMemberLevel() != null) {
             Example exa = new Example(BaseUserMemberLevel.class);
             Example.Criteria criteria = exa.createCriteria();
@@ -254,6 +272,8 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
 
         Integer buyCount = userMemberDTO.getBuyCount() == null ? 1 : userMemberDTO.getBuyCount();
         UserMemberVo userMemberVo = getMemberInfoByUserId(userMemberDTO.getUserId());
+        //保存修改记录
+        setModifyData(userMemberVo,userMemberDTO,request);
         if (userMemberVo == null) {
             baseUserMember.setRentFreeDays(freeDays);
             baseUserMember.setBuyCount(buyCount);
@@ -286,4 +306,34 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
         criteria.andIn("userId", userIds);
         mapper.deleteByExample(example);
     }
+    private void setModifyData(UserMemberVo beforeMember, UserMemberDTO aftereMember,HttpServletRequest request) throws Exception {
+        IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+        executorService.submit(()->{
+            try {
+                AppUserVo qppUser = detailBiz.getUserInfoById(beforeMember.getUserId());
+                BaseUserMemberExport baseUserMemberExport = BaseUserMemberExport
+                        .builder()
+                        .username(qppUser.getUsername())
+                        .beforeMemberLevel(beforeMember.getMemberLevel())
+                        .totalNumber(aftereMember.getTotalNumber() - beforeMember.getTotalNumber())
+                        .rentFreeDays(aftereMember.getRentFreeDays() - beforeMember.getRentFreeDays())
+                        .beforeDiscount(beforeMember.getDiscount())
+                        .discount(aftereMember.getDiscount())
+                        .status(1)
+                        .crtTime(System.currentTimeMillis())
+                        .crtId(Integer.valueOf(infoFromToken.getId()))
+                        .crtName(infoFromToken.getUniqueName())
+                        .memberName(qppUser.getRealname())
+                        .source(1)
+                        .build();
+                baseUserMemberExportBiz.insertSelective(baseUserMemberExport);
+
+                System.out.println(baseUserMemberExport);
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.error(e.getMessage());
+            }
+
+        });
+    }
 }
\ No newline at end of file

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

@@ -52,6 +52,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
     private  ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
     private final int BORDER_NUM=250;
+    private BaseUserMemberExport baseUserMemberExport;
 
 
     public void saveUserMember(UserMemberSaveDTO userMemberSaveDTO, Integer userId, String name) {
@@ -256,4 +257,9 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
     public void updateUserMemberExportDataStatus(Integer id) {
         mapper.updateUserMemberExportDataStatusById(id, 1);
     }
+
+    @Override
+    public void insertSelective(BaseUserMemberExport baseUserMemberExport){
+        mapper.insertSelective(baseUserMemberExport);
+    }
 }

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

@@ -101,7 +101,7 @@ public class BaseUserMemberController extends BaseController<BaseUserMemberBiz,
             return ObjectRestResponse.createDefaultFail();
         }
 
-        baseBiz.UpdateUserMember(userMemberDTO);
+        baseBiz.UpdateUserMember(userMemberDTO,request);
         return ObjectRestResponse.succ();
     }
 }

ace-modules/ace-admin/src/main/resources/mapper/BaseUserMemberExportMapper.xml

@@ -20,7 +20,8 @@
     </update>
 
     <select id="findExportDataPage" resultType="com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDTO">
-        select `id`,`member_level` as `memberLevel`,`member_name` as `memberName`,`rent_free_days` as `rentFreeDays`,`total_number` as `totalNumber`,`username`,`status`,`crt_name` as `crtName`,`crt_time`as `crtTime` from `base_user_member_export` where `is_del`=0
+        select `id`,`member_level` as `memberLevel`,`member_name` as `memberName`,`rent_free_days` as `rentFreeDays`,`total_number` as `totalNumber`,`username`,`status`,`crt_name` as `crtName`,`crt_time`as `crtTime` from `base_user_member_export`
+        where `is_del`=0  and  source = 0
             <if test="username != null and username != ''">
                and  `username`=#{username}
             </if>

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

@@ -297,6 +297,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		orderPageVo.setIllegalReserve(illegalReserve);
 		orderPageVo.setItems(orderItemBiz.selectList(new OrderItem(){{
 			setOrderId(orderPageVo.getId());
+			setType(104);
 		}}));
 		return ObjectRestResponse.succ(orderPageVo);
 	}

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

@@ -108,17 +108,18 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @IgnoreClientToken
     @CrossOrigin
     public ObjectRestResponse<PageDataVO<OrderListVo>> selectByUser(BaseOrderController.QueryOrderList dto) {
-        if (dto.getStartTime() != null) {
-            if (dto.getEndTime() == null) {
-                dto.setEndTime(new Date().getTime());
-            }
-        }
+		UserDTO userDTO = getAdminUserInfo();
+		if (userDTO == null) {
+			return ObjectRestResponse.succ(new PageDataVO<>());
+		}
+
         //车辆排班表查询订单详情
         if (dto.getOneNo()!=null) {
             dto.setPage(1);
             dto.setLimit(1);
             dto.setType(1);
         }
+
         if (StringUtils.isNotBlank(dto.getPhone()) || StringUtils.isNotBlank(dto.getRealName())) {
             List<AppUserLogin> appUserLoins = userFeign.getOne(dto.getPhone(), dto.getRealName());
             if (CollectionUtil.isNotEmpty(appUserLoins)) {
@@ -128,19 +129,11 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 return ObjectRestResponse.succ(new PageDataVO<>());
             }
         }
-
-
-        UserDTO userDTO = getAdminUserInfo();
-        if (userDTO == null) {
-            return ObjectRestResponse.succ(new PageDataVO<>());
-        }
-        //权限
-        if (userDTO.getDataAll()!=1&&dto.getType() != null && dto.getType() != 3) {
-            List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
-            List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
-            dto.setCompanyIds(companyIds);
-        }
-        //大区查询
+        //获取权限公司列表
+        List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
+        List<Integer> companyId = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
+        dto.setCompanyIds(companyId);
+        //大区搜索
         if (dto.getZoneId() != null) {
             if (userDTO.getDataAll() != 1 && !dto.getZoneId().equals(userDTO.getZoneId())) {
                 return ObjectRestResponse.succ(new PageDataVO<>());
@@ -167,11 +160,11 @@ public class BackStageOrderController extends CommonBaseController implements Us
             dto.setVehicleIds(vehicleIds);
         }
         //
-//		if (dto.getStartTime() != null) {
-//			if (dto.getEndTime() == null) {
-//				dto.setEndTime(new Date().getTime());
-//			}
-//		}
+		if (dto.getStartTime() != null) {
+			if (dto.getEndTime() == null) {
+				dto.setEndTime(new Date().getTime());
+			}
+		}
 		Query query = new Query(dto);
         PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
 
@@ -457,7 +450,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
         return backgroundBaseOrderBiz.getAllOrderList(dto);
     }
 
-
     @Data
     public static class ChangeVehicleDTO {
         String no;

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/CertificationService.java

@@ -47,6 +47,8 @@ import java.util.*;
 @Service
 @Slf4j
 public class CertificationService {
+    @Value("${certification.frequency:2}")
+    private Integer FREQUENCY;
     @Autowired
     private UserAuthentication authentication;
 
@@ -78,14 +80,14 @@ public class CertificationService {
         }
         //判断是否有填写身份证号
         if (StringUtils.isBlank(idInformation.getIdNumber())) {
-            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "未填写证件号");
+            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "请填写证件号");
         }
         if (!Validation.isIdCard(idInformation.getIdNumber())) {
-            return ObjectRestResponse.createFailedResult(ResultCode.WRONG_FORMAT_OF_ID_CARD, "填写的证件格式错误");
+            return ObjectRestResponse.createFailedResult(ResultCode.WRONG_FORMAT_OF_ID_CARD, "证件格式错误");
         }
         //判断是有否填写名字
         if (StringUtils.isBlank(idInformation.getName())) {
-            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "未填写姓名");
+            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "请填写姓名");
         }
         //判断是否有正面照片
         if (StringUtils.isBlank(idInformation.getFrontUrl())) {
@@ -100,20 +102,19 @@ public class CertificationService {
         //验证证件信息是否和填入的客户信息一致
         String name = credentialsData.getName();
         String number = credentialsData.getCode();
-        if (idInformation.getName().equals(name)) {
-            ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "姓名不一致");
+        if (!idInformation.getName().replaceAll(" ","").equals(name)) {
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "姓名不一致");
         }
-        if (idInformation.getIdNumber().equals(number)) {
-            ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "证件号不一致");
+        if (!idInformation.getIdNumber().replaceAll(" ","").equals(number)) {
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "证件号不一致");
         }
+       //判断是否超过认证次数
         Example exa = new Example(IdInformation.class);
-        Example.Criteria criteria = exa.createCriteria();
-        criteria.andEqualTo("idNumber", idInformation.getIdNumber());
+        exa.createCriteria().andEqualTo("idNumber", number);
         List<IdInformation> idInformatics = idInformationMapper.selectByExample(exa);
-        if (CollectionUtil.isNotEmpty(idInformatics)) {
-            log.error("该身份证已存在,不要重复认证");
-            log.info("图片已解析,未认证");
-            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "该身份证已存在,不要重复认证");
+        if (CollectionUtils.isNotEmpty(idInformatics) && idInformatics.size() > FREQUENCY) {
+            log.error("该身份证已超过最大认证次数");
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "该身份证已超过最大认证次数");
         }
         //3.验证
         boolean result = authentication.certificate(new UserMessage() {{
@@ -181,8 +182,8 @@ public class CertificationService {
             return ObjectRestResponse.succ(idInformation.getId());
         } catch (Exception e) {
             log.error(e.getMessage(), e);
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "认证失败,请重新认证");
+            TransactionAspectSupport.currentTransactionStatus();
+            return ObjectRestResponse.createFailedResult(ResultCode.INCOMPLETE_DATA, "无法识别,请重新上传");
         }
     }
 

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

@@ -151,4 +151,19 @@ public class AddOrUpdateVehicleVo {
      * 车辆状态
      */
     private Integer travelStatus;
+
+    /**
+     * 终端号
+     */
+    private String terminalNumber;
+
+    /**
+     * SIM卡号
+     */
+    private String simNumber;
+
+    /**
+     * 通讯类型
+     */
+    private String communicationType;
 }
\ No newline at end of file

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

@@ -534,7 +534,7 @@
                 and book_end_date >= now()
             </if>
             <!--增加时间限制，已审核的未出车小于当前时间的不显示， 已出车的结束时间延后两天小于当前时间的不显示-->
-            <if test="flag == true and status == 2">
+            <if test="flag == true and (status == 3 or status == 5 or status == 2)">
                 and ( (v4.id IS NOT NULL and DATE_ADD(v1.book_end_date,INTERVAL '2' DAY) >= now())  OR (v4.id IS NULL AND v1.book_end_date &gt;= now()))
             </if>
             <if test="flag == true">