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

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

@@ -88,9 +88,9 @@ public class CommonLogServiceImpl implements CommonLogService {
         }
         @Override
         public void run() {
-            if(!xxLogEntity.getServletPath().contains("/vehicleInfo/app/unauth/getVehiclePlanList")) {
-                log.info("用户请求信息：xxLogEntity = {}", xxLogEntity.toString());
-            }
+//            if(!xxLogEntity.getServletPath().contains("/vehicleInfo/app/unauth/getVehiclePlanList")) {
+//                log.info("用户请求信息：xxLogEntity = {}", xxLogEntity.toString());
+//            }
             mongoTemplate.insert(xxLogEntity, xxLogEntity.getMongoKey());
         }
     }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodVerificationController.java

@@ -5,20 +5,16 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.tour.biz.TourGoodVerificationBiz;
-import com.xxfc.platform.tour.common.TourBaseController;
 import com.xxfc.platform.tour.entity.TourGoodVerification;
 import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
 import com.xxfc.platform.tour.vo.TourGoodOrderVo;
-import com.xxfc.platform.tour.vo.TourVerificationInfoVo;
-import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/tourGood/verfication")
 @IgnoreClientToken
-public class TourGoodVerificationController extends TourBaseController<TourGoodVerificationBiz> {
+public class TourGoodVerificationController extends BaseController<TourGoodVerificationBiz, TourGoodVerification> {
 
 
     /**

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.Instant;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.List;
@@ -94,7 +95,7 @@ public class RentVehicleBookDTO extends PageParam {
         this.bookStartDate = bookStartDate;
         //首次设置
         if(null == this.startDateExtend) {
-            this.startDateExtend = YMR_SLASH_FORMATTER.format(LocalDateTime.parse(bookStartDate, YMR_SLASH_FORMATTER).minusDays(1L));
+            this.startDateExtend = YMR_SLASH_FORMATTER.format(LocalDate.parse(bookStartDate, YMR_SLASH_FORMATTER).minusDays(1L));
         }
     }
 
@@ -102,7 +103,7 @@ public class RentVehicleBookDTO extends PageParam {
         this.bookEndDate = bookEndDate;
         //首次设置
         if(null == this.endDateExtend) {
-            this.endDateExtend = YMR_SLASH_FORMATTER.format(LocalDateTime.parse(bookEndDate, YMR_SLASH_FORMATTER).plusDays(1L));
+            this.endDateExtend = YMR_SLASH_FORMATTER.format(LocalDate.parse(bookEndDate, YMR_SLASH_FORMATTER).plusDays(1L));
         }
     }
 }
\ No newline at end of file