Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -243,7 +243,7 @@ public class OrderMsgBiz {
                     }
                     break;
                 case TOUR:
-                    CompanyDetail startCompanyDetailTour = vehicleFeign.getCompanyDetail(orvd.getStartCompanyId()).getData();
+                    CompanyDetail startCompanyDetailTour = vehicleFeign.getCompanyDetail(otd.getStartCompanyId()).getData();
                     sms2AppUser(startCompanyDetailTour, null, orvd, otd, omd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_F, smsParams);
                     break;
                 case MEMBER:

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

@@ -1127,10 +1127,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         }
 
-        //筛选出查询条件所在月份
-        Set<String> allYearMonth = new HashSet<>();//记录所有年月
-        Map<String,List<String>> yearMonthAndDate = new HashMap<>();//预定年月 - 预定日期列表
-        Map<String,List<String>> yearMonthAndDateNotBooked = new HashMap<>();//未预定年月 - 未预定日期列表
+        //筛选出查询条件所在月份 如 想预定 8月29 ~ 9月 4日
+        Set<String> allYearMonth = new HashSet<>();//记录所有年月 "2019-08","2019-09"
+        Map<String,List<String>> yearMonthAndDate = new HashMap<>();//需比较已预定的年月 - 预定日期列表 为空（拒绝 预约记录时用到）
+        Map<String,List<String>> yearMonthAndDateNotBooked = new HashMap<>();//需比较未预定的年月 - 未预定日期列表 "2019-08-29"...."2019-09-04",
         classifyByYearMonth(notBookedDates,yearMonthAndDateNotBooked,allYearMonth);
         if(allYearMonth.size()>MAX_MONTH_COUNT_BOOKED_INFO_QUERY){
             throw  new CustomIllegalParamException(" only 3 month can be included <bookedInfo> param.");