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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -158,4 +158,9 @@ public interface UserFeign {
                                                     @RequestParam(value = "cono",required = false) String cono,
                                                     @RequestParam(value = "reason",required = false) String reason,
                                                     @RequestParam(value = "isSuccess") Boolean isSuccess);
+
+    @GetMapping("/app/user/collect/exist")
+    boolean isCollectionByTypeAndTypeId(@RequestParam("userId") Integer userId,
+                                        @RequestParam(value = "type") int type,
+                                        @RequestParam("id") Integer typId);
 }

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

@@ -14,12 +14,14 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.tour.entity.TourGood;
 import com.xxfc.platform.tour.feign.TourFeign;
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.collections4.CollectionUtils;
 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.util.List;
+import java.util.Objects;
 
 /**
  * ${DESCRIPTION}
@@ -105,17 +107,13 @@ public class AppUserCollectBiz extends BaseBiz<AppUserCollectMapper, AppUserColl
     }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+    public boolean isCollectionByTypeAndTypeId(Integer userId,int type, Integer typeId) {
+        AppUserCollect appUserCollect  = new AppUserCollect();
+        appUserCollect.setType(type);
+        appUserCollect.setTypeId(typeId);
+        appUserCollect.setUserId(userId);
+        appUserCollect.setIsDel(0);
+        List<AppUserCollect> collect = mapper.select(appUserCollect);
+        return CollectionUtils.isNotEmpty(collect);
+    }
 }

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

@@ -19,6 +19,7 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
 import com.xxfc.platform.tour.feign.TourFeign;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -108,4 +109,11 @@ public class AppUserCollectController extends CommonBaseController {
         return collectBiz.upUserCollect(collectDTO);
     }
 
+    @GetMapping("/collect/exist")
+    @ApiOperation("判断是否收藏")
+  public boolean isCollectionByTypeAndTypeId(@RequestParam("userId") Integer userId,
+                                             @RequestParam(value = "type") int type,
+                                             @RequestParam("id") Integer typId){
+       return collectBiz.isCollectionByTypeAndTypeId(userId,type,typId);
+    }
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopFindDTO.java

@@ -19,4 +19,6 @@ public class CampsiteShopFindDTO extends PageParam {
      private Integer type;
 
      private String name;
+
+     private String keyWord;
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopDetailVo.java

@@ -100,4 +100,9 @@ public class CampsiteShopDetailVo {
 
     @ApiModelProperty(value = "海报背景")
     private String posterBackground;
+
+    /**
+     * 是否已经被收藏
+     */
+    private Boolean hasCollection;
 }

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/CampSiteApplication.java

@@ -19,6 +19,7 @@ import tk.mybatis.spring.annotation.MapperScan;
  */
 @SpringBootApplication(scanBasePackages = {
         "com.xxfc.platform",
+        "com.github.wxiaoqi.security.admin.support.aop",
         "com.github.wxiaoqi.security.common.handler",
         "com.github.wxiaoqi.security.common.log"
 })

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.campsite.biz;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.RandomUtil;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
@@ -22,6 +23,7 @@ import com.xxfc.platform.campsite.mapper.CampsiteShopMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
 import java.time.Instant;
@@ -41,6 +43,8 @@ import java.util.stream.Collectors;
 @Slf4j
 public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
 
+    private final int CAMPSITE_COLLECTION_TYPE=3;
+
     @Autowired
     private CampsiteShopTagBiz campsiteShopTagBiz;
 
@@ -56,6 +60,9 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
     @Resource(name = "customRedisTemplate")
     ValueOperations<String, String> campsiteValueOperations;
 
+    @Autowired
+    private  UserFeign userFeign ;
+
     /**
      * 营地缓存前缀
      */
@@ -81,7 +88,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
 
 
     public PageDataVO<CampsiteShopPageVo> findCampsiteShopPageByType(CampsiteShopFindDTO campsiteShopFindDTO) {
-        String campsite_cache_key = String.format("%s%s%s%s%s", campsiteShopFindDTO.getType() == null ? "" : campsiteShopFindDTO.getType() + ":",
+/*        String campsite_cache_key = String.format("%s%s%s%s%s", campsiteShopFindDTO.getType() == null ? "" : campsiteShopFindDTO.getType() + ":",
                 campsiteShopFindDTO.getAddrProvince() == null ? "" : campsiteShopFindDTO.getAddrProvince() + ":",
                 campsiteShopFindDTO.getAddrCity()==null?"":campsiteShopFindDTO.getAddrCity()+":",
                 campsiteShopFindDTO.getPage()+":",
@@ -90,9 +97,9 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
         if (result != null) {
             return JSONObject.parseObject(result, new TypeReference<PageDataVO<CampsiteShopPageVo>>() {
             });
-        }
+        }*/
         PageDataVO<CampsiteShopPageVo> campsiteShopPageDataVO = findCampsiteShopPageByTypeAndName(campsiteShopFindDTO);
-        campHashOperations.put(CAMPSITE_LIST_CACHE_PREKEY,campsite_cache_key,JSONObject.toJSONString(campsiteShopPageDataVO));
+/*        campHashOperations.put(CAMPSITE_LIST_CACHE_PREKEY,campsite_cache_key,JSONObject.toJSONString(campsiteShopPageDataVO));*/
         return campsiteShopPageDataVO;
     }
 
@@ -100,8 +107,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
     public PageDataVO<CampsiteShopPageVo> findCampsiteShopPageByTypeAndName(CampsiteShopFindDTO campsiteShopFindDTO){
         PageDataVO<CampsiteShopPageVo> campsiteShopPageDataVO = new PageDataVO<>();
         PageDataVO<CampsiteShopPageDTO> pageDataVO = PageDataVO.pageInfo(campsiteShopFindDTO.getPage(), campsiteShopFindDTO.getLimit(),
-                () -> mapper.findAllCampsiteShopsByTypeOrCodeOrName(campsiteShopFindDTO.getType(),campsiteShopFindDTO.getAddrProvince(),
-                        campsiteShopFindDTO.getAddrCity(),campsiteShopFindDTO.getName()));
+                () -> mapper.findAllCampsiteShopsByTypeOrCodeOrName(campsiteShopFindDTO));
         List<CampsiteShopPageDTO> campsiteShopPageDTOS = pageDataVO.getData();
         if (CollectionUtils.isEmpty(campsiteShopPageDTOS)) {
             campsiteShopPageDataVO.setPageNum(campsiteShopFindDTO.getPage());
@@ -131,18 +137,19 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
     }
 
     /**
-     * @param id
      * @param longitude 经度
      * @param latitude  纬度
      * @return
      */
-    public CampsiteShopDetailVo findCampsiteShopDetailById(Integer id, Double longitude, Double latitude) {
+    public CampsiteShopDetailVo findCampsiteShopDetailById(Integer userId,Integer id, Double longitude, Double latitude) {
 
+/*
         String result = campsiteValueOperations.get(String.format("%s%d", CAMSITE_DETAIL_CACHE_PREKEY, id));
         if (Objects.nonNull(result)) {
             return JSONObject.parseObject(result, new TypeReference<CampsiteShopDetailVo>() {
             });
         }
+*/
 
         CampsiteShopDetailVo campsiteShopDetailVo = new CampsiteShopDetailVo();
         CampsiteShopDetailDTO campsiteShopDetailDTO = mapper.findCampsiteShopDetailById(id);
@@ -181,7 +188,17 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
                 campsiteShopDetailVo.setDistance(String.format("%.1f", distance));
             }
         }
-        campsiteValueOperations.set(String.format("%s%d", CAMSITE_DETAIL_CACHE_PREKEY, id), JSONObject.toJSONString(campsiteShopDetailVo));
+
+        if (Objects.nonNull(userId)){
+            boolean isCollection = userFeign.isCollectionByTypeAndTypeId(userId,CAMPSITE_COLLECTION_TYPE,id);
+            campsiteShopDetailVo.setHasCollection(isCollection);
+        }else {
+            campsiteShopDetailVo.setHasCollection(false);
+        }
+
+
+
+/*        campsiteValueOperations.set(String.format("%s%d", CAMSITE_DETAIL_CACHE_PREKEY, id), JSONObject.toJSONString(campsiteShopDetailVo));*/
         return campsiteShopDetailVo;
     }
 
@@ -258,7 +275,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
         //保存或更新 * 营地与营地类型信息
         List<Integer> campsiteTagDTOS = campsiteShopAdminDTO.getCampsiteTagDTOS();
         campsiteShopTagBiz.saveBatch(campsiteTagDTOS, campsiteShop.getId());
-        redisTemplate.delete(CAMPSITE_LIST_CACHE_PREKEY);
+//        redisTemplate.delete(CAMPSITE_LIST_CACHE_PREKEY);
         return effectRows;
     }
 
@@ -294,8 +311,8 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
         }
         campsiteShopAdminVO.setCarouse(campsiteShopAdminVO.getCarouse() == null ? new ArrayList<CampsiteShopCarouselVo>() : campsiteShopAdminVO.getCarouse());
         campsiteShopAdminVO.setCampsiteTagListVos(campsiteShopAdminVO.getCampsiteTagListVos() == null ? new ArrayList<CampsiteTagListVo>() : campsiteShopAdminVO.getCampsiteTagListVos());
-        redisTemplate.delete(String.format("%s%d", CAMSITE_DETAIL_CACHE_PREKEY, id));
-        redisTemplate.delete(CAMPSITE_LIST_CACHE_PREKEY);
+//        redisTemplate.delete(String.format("%s%d", CAMSITE_DETAIL_CACHE_PREKEY, id));
+//        redisTemplate.delete(CAMPSITE_LIST_CACHE_PREKEY);
         return campsiteShopAdminVO;
     }
 
@@ -307,20 +324,20 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
      */
     public int updateCampsiteSatus(int id) {
         int effectRows = mapper.updateCampsiteStatusById(id, 1);
-        if (effectRows > 0) {
+/*        if (effectRows > 0) {
             redisTemplate.delete(String.format("%s%d", CAMSITE_DETAIL_CACHE_PREKEY, id));
             redisTemplate.delete(CAMPSITE_LIST_CACHE_PREKEY);
-        }
+        }*/
         return effectRows;
     }
 
 
     public int upperOrLowerShelves(Integer id, Integer status) {
         int effectRows = mapper.updateCampsiteSaleStatusById(id, status);
-        if (effectRows > 0) {
+/*        if (effectRows > 0) {
             redisTemplate.delete(String.format("%s%d", CAMSITE_DETAIL_CACHE_PREKEY, id));
             redisTemplate.delete(CAMPSITE_LIST_CACHE_PREKEY);
-        }
+        }*/
         return effectRows;
     }
 

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/mapper/CampsiteShopMapper.java

 package com.xxfc.platform.campsite.mapper;
 
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
-import com.xxfc.platform.campsite.dto.CampsiteShopAdminFindDTO;
-import com.xxfc.platform.campsite.dto.CampsiteShopAdminPageDTO;
-import com.xxfc.platform.campsite.dto.CampsiteShopDetailDTO;
-import com.xxfc.platform.campsite.dto.CampsiteShopPageDTO;
+import com.xxfc.platform.campsite.dto.*;
 import com.xxfc.platform.campsite.entity.CampsiteShop;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
@@ -24,12 +21,8 @@ public interface CampsiteShopMapper extends Mapper<CampsiteShop> {
     /**
      * 根据店铺类型查找店铺列表
      *
-     * @param typeId
      */
-    List<CampsiteShopPageDTO> findAllCampsiteShopsByTypeOrCodeOrName(@Param("typeId") Integer typeId,
-                                                                     @Param("proviceCode") Integer proviceCode,
-                                                                     @Param("cityCode") Integer cityCode,
-                                                                     @Param("name") String name);
+    List<CampsiteShopPageDTO> findAllCampsiteShopsByTypeOrCodeOrName(CampsiteShopFindDTO campsiteShopFindDTO);
 
     /**
      * 首页营地列表

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/CampsiteShopController.java

 package com.xxfc.platform.campsite.rest;
 
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
@@ -31,11 +32,13 @@ public class CampsiteShopController extends BaseController<CampsiteShopBiz, Camp
     @GetMapping("/app/unauth/shops")
     public ObjectRestResponse<PageDataVO<CampsiteShopPageVo>> findCampsiteShopPageByTypeAndName(@RequestParam(value = "type", required = false) Integer type,
                                                                                                 @RequestParam(value = "pageNo", required = false, defaultValue = "1") Integer pageNo,
-                                                                                                @RequestParam(value = "pageSize", required = false, defaultValue = "6") Integer pageSize) {
+                                                                                                @RequestParam(value = "pageSize", required = false, defaultValue = "6") Integer pageSize,
+                                                                                                @RequestParam(value = "keyWord",required = false) String keyWord) {
         CampsiteShopFindDTO campsiteShopFindDTO = new CampsiteShopFindDTO();
         campsiteShopFindDTO.setType(type);
         campsiteShopFindDTO.setPage(pageNo);
         campsiteShopFindDTO.setLimit(pageSize);
+        campsiteShopFindDTO.setKeyWord(keyWord);
         PageDataVO<CampsiteShopPageVo> pageDataVO = getBaseBiz().findCampsiteShopPageByType(campsiteShopFindDTO);
         return ObjectRestResponse.succ(pageDataVO);
 }
@@ -55,8 +58,9 @@ public class CampsiteShopController extends BaseController<CampsiteShopBiz, Camp
     @GetMapping("/app/unauth/shop")
     public ObjectRestResponse<CampsiteShopDetailVo> findCampsiteShopDetailById(@RequestParam(value = "id") Integer id,
                                                                                @RequestParam(value = "longitude", required = false) Double longitude,
-                                                                               @RequestParam(value = "latitude", required = false) Double latitude) {
-        CampsiteShopDetailVo campsiteShopDetailVo = getBaseBiz().findCampsiteShopDetailById(id, longitude, latitude);
+                                                                               @RequestParam(value = "latitude", required = false) Double latitude,
+                                                                               AppUserDTO appUserDTO) {
+        CampsiteShopDetailVo campsiteShopDetailVo = getBaseBiz().findCampsiteShopDetailById(appUserDTO.getUserid(),id, longitude, latitude);
         return ObjectRestResponse.succ(campsiteShopDetailVo);
     }
 

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -66,18 +66,21 @@
         cs.sale_state = 1
         AND cs.is_del = 0
 
-        <if test="typeId!=null">
-            and cst.tag_id=#{typeId}
+        <if test="type!=null">
+            and cst.tag_id=#{type}
         </if>
-        <if test="proviceCode != null">
+        <if test="addrProvince != null">
             and cs.`province`=#{proviceCode}
         </if>
-        <if test="cityCode != null">
+        <if test="addrCity != null">
             and cs.`city`=#{cityCode}
         </if>
         <if test="name!=null and name!=''">
             and cs.`name` like concat('%',#{name},'%')
         </if>
+        <if test="keyWord!=null and keyWord!=''">
+            and (cs.`name` like concat('%',#{keyWord},'%') or cs.address like concat('%',#{keyWord},'%') or `ct`.name like concat('%',#{keyWord},'%') )
+        </if>
         GROUP BY cs.id
         order by cs.hot DESC,cs.crt_time DESC
     </select>

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<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;
 
@@ -101,19 +103,18 @@ public class CertificationService {
         String name = credentialsData.getName();
         String number = credentialsData.getCode();
         if (idInformation.getName().equals(name)) {
-            ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "姓名不一致");
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "姓名不一致");
         }
         if (idInformation.getIdNumber().equals(number)) {
-            ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "证件号不一致");
+            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-server/src/main/resources/mapper/VehicleMapper.xml

@@ -986,8 +986,12 @@
         from
         <!--
             查询开始时间 前面的最后一条 预约记录
-            查询结束时间 后面的第一条 预约记录 -->
-        (select vehicle_id, max(if(book_end_date &lt; #{startDateExtend}, book_end_date, null)) as max_book_end_date, min(if(book_start_date &gt; #{endDateExtend}, book_start_date, null)) as min_book_start_date from vehicle_book_record where status != 4 and status != 6 group by vehicle_id) sevbr
+            查询结束时间 后面的第一条 预约记录
+            添加比较actual_start_date 和 actual_end_date-->
+        (select vehicle_id
+            , max(if(IFNULL(actual_end_date, book_end_date) &lt; #{startDateExtend}, IFNULL(actual_end_date,book_end_date), null)) as max_book_end_date
+            , min(if(IFNULL(actual_start_date, book_start_date) &gt; #{endDateExtend}, IFNULL(actual_start_date, book_start_date), null)) as min_book_start_date
+        from vehicle_book_record where status != 4 and status != 6 group by vehicle_id) sevbr
         left join vehicle_book_record vbre
         on sevbr.vehicle_id = vbre.vehicle_id and sevbr.max_book_end_date = vbre.book_end_date and vbre.status != 4 and vbre.status != 6
         left join vehicle_book_record vbrs