Merge branch 'dev' into hz_dev

ace-common/src/main/java/com/github/wxiaoqi/security/common/constant/CommonConstants.java

 package com.github.wxiaoqi.security.common.constant;
 
+import java.time.format.DateTimeFormatter;
+
 /**
  * Created by ace on 2017/8/29.
  */
@@ -39,4 +41,8 @@ public class CommonConstants {
     public static final String LONG_TIME = "HHmmss";
     public static final String SHORT_TIME = "HHmm";
     public static final String DATE_TIME_LINE = "yyyy-MM-dd HH:mm:ss";
+
+    public static final DateTimeFormatter DATE_TIME_LINE_FORMATTER = DateTimeFormatter.ofPattern(DATE_TIME_LINE);
+    public static final DateTimeFormatter YMR_SLASH_FORMATTER = DateTimeFormatter.ofPattern(YMR_SLASH);
+
 }

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-order/xx-order-server/src/main/resources/bootstrap.yml

@@ -13,7 +13,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1:8848
+        server-addr: 127.0.0.1:8848, 10.1.37.166:8848
         #共用配置，+ mongodb日志配置
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
 

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodVerificationBiz.java

@@ -107,7 +107,7 @@ public class TourGoodVerificationBiz extends BaseBiz<TourGoodVerificationMapper,
                 if (list.size()==0){
                     return  ObjectRestResponse.succ();
                 }
-            }else if (list!=null&&companyIds.size()>0){
+            }else if (companyIds!=null&&companyIds.size()>0){
                 list=mapper.getSiteList(null,null,companyIds);
             }
             list=mapper.getGoodList(list);

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleBookRecord.java

@@ -176,7 +176,7 @@ public class VehicleBookRecord {
     private Integer haveViolation;
 
     /**
-     * 订单号
+     * 租车订单号或者旅游路线id
      */
     private String orderNo;
 

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

@@ -4,9 +4,15 @@ import com.github.wxiaoqi.security.common.vo.PageParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.List;
 import java.util.Map;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.DATE_TIME_LINE_FORMATTER;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.YMR_SLASH_FORMATTER;
+
 @Data
 public class RentVehicleBookDTO extends PageParam {
     //根据车型、时间、距离，门店，预定车辆
@@ -57,9 +63,6 @@ public class RentVehicleBookDTO extends PageParam {
     @ApiModelProperty("订单号")
     private String orderNo;
 
-    @ApiModelProperty("停靠公司id")
-    Integer parkBranchCompanyId;
-
     @ApiModelProperty("指定车牌")
     String numberPlate;
 
@@ -71,4 +74,35 @@ public class RentVehicleBookDTO extends PageParam {
      */
     @ApiModelProperty("随车物品id以及数量 List<Map<id,数量>>")
     Map<Integer,Integer> selectedAccItem;
+
+    @ApiModelProperty("停靠公司id")
+    Integer parkBranchCompanyId;
+
+    @ApiModelProperty("开始公司id")
+    Integer startCompanyId;
+
+    @ApiModelProperty("结束公司id")
+    Integer endCompanyId;
+
+    @ApiModelProperty("扩展开始时间")
+    String startDateExtend;
+
+    @ApiModelProperty("扩展结束时间")
+    String endDateExtend;
+
+    public void setBookStartDate(String bookStartDate) {
+        this.bookStartDate = bookStartDate;
+        //首次设置
+        if(null == this.startDateExtend) {
+            this.startDateExtend = YMR_SLASH_FORMATTER.format(LocalDateTime.parse(bookStartDate, YMR_SLASH_FORMATTER).minusDays(1L));
+        }
+    }
+
+    public void setBookEndDate(String bookEndDate) {
+        this.bookEndDate = bookEndDate;
+        //首次设置
+        if(null == this.endDateExtend) {
+            this.endDateExtend = YMR_SLASH_FORMATTER.format(LocalDateTime.parse(bookEndDate, YMR_SLASH_FORMATTER).plusDays(1L));
+        }
+    }
 }
\ No newline at end of file

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

@@ -1189,8 +1189,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         List<String> notBookedDates = Lists.newArrayList();
         if(StringUtils.isNotBlank(dto.getBookEndDate())&&
                 StringUtils.isNotBlank(dto.getBookEndDate())) {
-            notBookedDates = convertDatePeriod2List(dto.getBookStartDate(),
-                    dto.getBookEndDate());
+//            notBookedDates = convertDatePeriod2List(dto.getBookStartDate(),
+//                    dto.getBookEndDate());
+            notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
+                    dto.getEndDateExtend());
         }
 
         //若传入预定信息查询条件，则查询对应月份预定信息查询条件（不超过3个月）

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

@@ -163,6 +163,8 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
             dto.setLimit(1);
             dto.setPage(1);
             dto.setParkBranchCompanyId(dto.getLiftCompany());
+            dto.setStartCompanyId(dto.getLiftCompany());
+            dto.setEndCompanyId(dto.getEndCompanyId());
             //查询可车辆信息
             PageDataVO<Vehicle> pageDataVO = vehicleBiz.searchUsableVehicle(dto);
             if (pageDataVO.getData().size() <= 0) {