Merge branch 'master' into base-modify

# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

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

@@ -29,8 +29,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.HOUR_MINUTE_FORMATTE_HUTOOL;
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.admin.constant.enumerate.MemberEnum.NONE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 /**
@@ -472,7 +472,7 @@ public class OrderMsgBiz {
     private void handelSmsParamApp(CompanyDetail startCompanyDetail, CompanyDetail endCompanyDetail, OrderRentVehicleDetail orvd, OrderTourDetail otd, OrderMemberDetail omd, BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int paramHandelType) {
         switch (paramHandelType) {
             case SmsTemplateDTO.PAY_A :
-                if(0 < appUserDTO.getMemberLevel() ) {
+                if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
                     smsParams.add(USER_N+ appUserDTO.getRealname());
@@ -502,14 +502,14 @@ public class OrderMsgBiz {
                 smsParams.add(appUserDTO.getRentFreeDays().toString());
                 break;
             case SmsTemplateDTO.CANCEL_A :
-                if(0 < appUserDTO.getMemberLevel() ) {
+                if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
                     smsParams.add(USER_N+ appUserDTO.getRealname());
                 }
                 break;
             case SmsTemplateDTO.PAY_I :
-                if(0 < appUserDTO.getMemberLevel() ) {
+                if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
                     smsParams.add(USER_N+ appUserDTO.getRealname());
@@ -517,7 +517,7 @@ public class OrderMsgBiz {
                 smsParams.add(startCompanyDetail.getAddrDetail());
                 break;
             case SmsTemplateDTO.PAY_J :
-                if(0 < appUserDTO.getMemberLevel() ) {
+                if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
                     smsParams.add(USER_N+ appUserDTO.getRealname());
@@ -534,7 +534,7 @@ public class OrderMsgBiz {
     private void handelDepositSmsParamApp(BigDecimal originalAmount, BigDecimal violateAmount, BigDecimal refundAmount, BigDecimal residueAmount,BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int paramHandelType) {
         switch (paramHandelType) {
             case SmsTemplateDTO.CANCEL_C :
-                if(0 < appUserDTO.getMemberLevel() ) {
+                if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
                     smsParams.add(USER_N+ appUserDTO.getRealname());
@@ -549,7 +549,7 @@ public class OrderMsgBiz {
             case SmsTemplateDTO.REFUND_A:
                 Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
                 Integer rentDepositAutoRefundTime = new Integer(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
-                if(0 < appUserDTO.getMemberLevel() ) {
+                if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
                     smsParams.add(USER_N+ appUserDTO.getRealname());
@@ -562,7 +562,7 @@ public class OrderMsgBiz {
                 smsParams.add(DateUtil.formatDateTime(DateUtil.date(baseOrder.getRefundTime() + Long.valueOf(rentDepositAutoRefundTime * 60 * 60 * 1000))));
                 break;
             case SmsTemplateDTO.REFUND_B:
-                if(0 < appUserDTO.getMemberLevel() ) {
+                if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
                     smsParams.add(USER_N+ appUserDTO.getRealname());

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

@@ -59,6 +59,7 @@ public class VehicleActiveService {
      * @param departureVo
      */
     public void departure(VehicleDepartureVo departureVo) {
+        log.info("出车参数： departureVo = {}", departureVo.toString());
         Vehicle vehicle = vehicleMapper.selectByPrimaryKey(departureVo.getVehicleId());
         if (vehicle == null) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
@@ -68,7 +69,7 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
                     ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
         }
-        if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
+        if (vehicle.getStatus().equals(VehicleStatus.DISCARD.getCode()) || vehicle.getIsDel() == 1) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
         }
@@ -85,6 +86,7 @@ public class VehicleActiveService {
             vehicle.setMileageLastUpdate(MileageLift1);
             vehicle.setExpectDestinationBranchCompanyId(departureVo.getExpectArrivalBranchCompanyId());
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
+
             // 修改车辆状态，确认是空闲状态
             int result = vehicleMapper.updateStatusByIdAndStatus(departureVo.getVehicleId(), VehicleStatus.DEPARTURE.getCode(),
                     VehicleStatus.NORMAL.getCode());
@@ -126,7 +128,6 @@ public class VehicleActiveService {
                     departureLog.setUserTel(vehicleBookRecord.getVehicleUserPhone());
                 }
                 vehicleDepartureLogMapper.insert(departureLog);
-                log.info("收车成功： 收车记录：departureLog = {}", departureLog.toString());
             }
             // 车辆活动日志
             VehicleActiveLog activeLog = new VehicleActiveLog();
@@ -180,7 +181,6 @@ public class VehicleActiveService {
     }
 
     public void arrival(VehicleArrivalVo arrivalVo) {
-        try {
         Vehicle vehicle = vehicleMapper.selectByPrimaryKey(arrivalVo.getVehicleId());
         if (vehicle == null) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
@@ -190,6 +190,10 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
                     ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
         }
+//        if (!vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
+//            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
+//                    ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
+//        }
         Integer Mileagerest = vehicle.getMileageLastUpdate();
         Integer Mileagerest1 = arrivalVo.getMileage();
         if (Mileagerest1 == null) {
@@ -202,6 +206,7 @@ public class VehicleActiveService {
                 vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());
                 updateBookRecordStatus(vehicleBookRecord, 2);
             }
+
             // 写入车辆公里数,还车分公司id
             vehicle.setMileageLastUpdate(Mileagerest1);
             if (vehicleBookRecord != null) {
@@ -209,8 +214,12 @@ public class VehicleActiveService {
             }
             vehicle.setExpectDestinationBranchCompanyId(0);
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
+
+
+
             // 出车记录
             VehicleDepartureLogVo departureLogVo = vehicleDepartureLogMapper.selectByBookRecordId(arrivalVo.getBookRecordId());
+
             if (departureLogVo == null) {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
                         ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
@@ -227,6 +236,10 @@ public class VehicleActiveService {
             }
             if(flag) { //如果此条记录后面还有未收车记录，就不修改车辆状态
                 int result = vehicleMapper.updateStatus(arrivalVo.getVehicleId(), VehicleStatus.NORMAL.getCode());
+//                if (result == 0) {
+//                    throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
+//                            ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
+//                }
             }
 
             DateTime arrivalDate = new DateTime(vehicleBookRecord.getBookEndDate());
@@ -273,14 +286,27 @@ public class VehicleActiveService {
             activeLog.setEndTime(new Date());
             activeLog.setUpdateTime(new Date());
             vehicleActiveLogMapper.updateByPrimaryKeySelective(activeLog);
-                log.info("收车成功： 收车记录：departureLog = {}", departureLog.toString());
+
+            //取消预定时间 bookInfo和bookRecord
+//            BookVehicleVO bookVehicleVo = new BookVehicleVO();
+//            BeanUtils.copyProperties(vehicleBookRecord, bookVehicleVo);
+//            bookVehicleVo.setNotCheckTimeLegal(Boolean.TRUE);
+//            bookVehicleVo.setBookStartDate(null);
+//            bookVehicleVo.setBookEndDate(null);
+//            bookVehicleVo.setUnbookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DATE_TIME_FORMATTER));
+//            bookVehicleVo.setUnbookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DATE_TIME_FORMATTER));
+//           try {
+//               Boolean hasSuc = vehicleBiz.unbookVehicle(bookVehicleVo);
+//               if(!hasSuc){
+//                   throw new BaseException(ResCode.VEHICLE_UNBOOK_FAIL.getDesc(), ResCode.VEHICLE_UNBOOK_FAIL.getCode());
+//               }
+//           } catch ( Exception e) {
+//                e.printStackTrace();
+//           }
         } else {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }
 
     //添加出车时间过滤 再出车开始时间前一天至结束时间内可以出车,并且预定记录为已审核状态
@@ -290,21 +316,17 @@ public class VehicleActiveService {
             if (vehicleBookRecord != null) {
                 DateTime startDate = new DateTime(vehicleBookRecord.getBookStartDate());
                 DateTime endDate = new DateTime(vehicleBookRecord.getBookEndDate());
-                Map<String, Object> param = new HashMap<>();
-                param.put("vehicleId", vehicleBookRecord.getVehicleId());
-                param.put("bookedEndDate", vehicleBookRecord.getBookStartDate());
-                List<VehicleBookRecordVo> list = vehicleBookRecordBiz.selectByVehicleIdAndTime(param);
+                List<VehicleBookRecordVo> list = vehicleBookRecordBiz.selectByVehicleId(vehicleBookRecord.getVehicleId());
                 if (list != null && list.size() > 0) {
                     Iterator<VehicleBookRecordVo> iterator = list.iterator();
                     while (iterator.hasNext()) {
                         VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                        //未出车且出车时间小于当前时间
-                        if (vehicleBookRecordVo.getVehicleDepartureLogVo() == null && (vehicleBookRecordVo.getBookEndDate().getTime() - new Date().getTime()) < 0) {
+                        //未出车且超过出车时间和已出车的和本条记录过滤，剩下为正常未出车记录
+                        if ((vehicleBookRecordVo.getVehicleDepartureLogVo() == null && vehicleBookRecordVo.getBookEndDate().getTime() - new Date().getTime() < 0) || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null) || (arrivalVo.getBookRecordId() == vehicleBookRecord.getId())) {
                             iterator.remove();
                         }
                     }
                 }
-                //出车前一天，且当前时间小于结束时间，且没有未出车的记录
                 if(!(startDate.minusDays(1).compareTo(DateTime.now()) <= 0 && DateTime.now().compareTo(endDate) <= 0 && vehicleBookRecord.getStatus() == VehicleBookRecordStatus.APPROVE.getCode() && (list == null || list.size() <= 0))) {
                     throw new BaseException(ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getDesc(),
                             ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getCode());

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

@@ -327,7 +327,7 @@
 
     <select id="selectByVehicleIdAndTime" parameterType="java.util.Map" resultMap="searchBookRecord">
         select v1.* from vehicle_book_record v1
-         where v1.vehicle_id = #{vehicleId}   and v1.book_end_date &lt;= #{bookedEndDate} and v1.status BETWEEN 1 and 2
+         where v1.vehicle_id = #{vehicleId} and v1.status BETWEEN 1 and 2
     </select>
 
     <select id="selectZeroHourRecord" resultMap="searchBookRecord" parameterType="java.util.Map">