Merge branch 'master-zjw'

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

@@ -387,7 +387,20 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             }});
 
             if(null == crosstown) {
-                throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet(StrUtil.format("退款第一部分押金失败，获取不了还车/定损记录，订单号：{}, crosstownTypeEnum: {}",  orderMQDTO.getId(), crosstownTypeEnum)));
+                //设置等待时间 5秒
+                try {
+                    Thread.sleep(5000L);
+                    crosstown = crosstownBiz.selectOne(new OrderVehicleCrosstown(){{
+                        setOrderId(orderMQDTO.getId());
+                        setType(crosstownTypeEnum);
+                    }});
+                    if(null == crosstown) {
+                        throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet(StrUtil.format("退款第一部分押金失败，获取不了还车/定损记录，订单号：{}, crosstownTypeEnum: {}",  orderMQDTO.getId(), crosstownTypeEnum)));
+                    }
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                    throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet(StrUtil.format("退款第一部分押金失败，获取不了还车/定损记录，订单号：{}, crosstownTypeEnum: {}",  orderMQDTO.getId(), crosstownTypeEnum)));
+                }
             }
 
             if(null == crosstown.getRestDeposit()

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

@@ -114,10 +114,10 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
             }
             if(depositRefundRecord.getStatus() == DepositRefundStatus.VIOLATIONARRIVAL.getCode()) {
                 Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-                Integer rentDepositAutoRefundTime = new Integer(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
+                Long rentDepositAutoRefundTime = new Long(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
                 if(rentDepositAutoRefundTime != null) {
-                    Long time = Long.parseLong(rentDepositAutoRefundTime + "");
-                    depositRefundRecord.setRentDepositAutoRefundTime(depositRefundRecord.getCrtTime() + time * 60 * 60 * 1000);
+//                    Long time = Long.parseLong(rentDepositAutoRefundTime + "");
+                    depositRefundRecord.setRentDepositAutoRefundTime(depositRefundRecord.getCrtTime() + (rentDepositAutoRefundTime * 60L * 1000L));
                 }
             }
         }

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

@@ -612,7 +612,7 @@ public class OrderMsgBiz {
                 break;
             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());
+                Long rentDepositAutoRefundTime = new Long(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
                 if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
@@ -623,7 +623,7 @@ public class OrderMsgBiz {
                 smsParams.add(violateAmount.toString());
                 smsParams.add(refundAmount.toString());
                 smsParams.add(residueAmount.toString());
-                smsParams.add(DateUtil.formatDateTime(DateUtil.date(baseOrder.getRefundTime() + Long.valueOf(rentDepositAutoRefundTime * 60 * 60 * 1000))));
+                smsParams.add(DateUtil.formatDateTime(DateUtil.date(baseOrder.getRefundTime() + (rentDepositAutoRefundTime * 60L * 1000L))));
                 break;
             case SmsTemplateDTO.REFUND_B:
                 if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RemindMsgJobHandler.java

@@ -62,9 +62,6 @@ public class RemindMsgJobHandler extends IJobHandler {
 
     @Override
     public ReturnT<String> execute(String idLastNumInterval) {
-        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        Integer rentDepositAutoRefundTime = new Integer(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
-
         try {
             Date tomorrow = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyyy-MM-dd"), 1);
             Date tomorrowBegin = DateUtil.beginOfDay(tomorrow);
@@ -75,8 +72,6 @@ public class RemindMsgJobHandler extends IJobHandler {
                     .where(WeekendSqls.<BaseOrder>custom()
                                     .andIn(BaseOrder::getType, CollectionUtil.newArrayList(OrderTypeEnum.RENT_VEHICLE.getCode(), OrderTypeEnum.TOUR.getCode()))
                                     .andEqualTo(BaseOrder::getStatus, OrderStatusEnum.ORDER_TOSTART.getCode()) //待出发的订单
-//                                    .andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.beginOfDay(tomorrow))
-//                                    .andGreaterThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.endOfDay(tomorrow))
                     ).build());
 
             for(BaseOrder baseOrder : lists) {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RefundMQHandler.java

@@ -5,6 +5,7 @@ import cn.hutool.json.JSONUtil;
 import com.rabbitmq.client.Channel;
 import com.xxfc.platform.order.biz.OrderAccountBiz;
 import com.xxfc.platform.order.biz.OrderRefundBiz;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
@@ -46,7 +47,10 @@ public class RefundMQHandler {
                     String msg = new String(message.getBody(), "UTF-8");
                     OrderMQDTO orderMQDTO = JSONUtil.toBean(msg, OrderMQDTO.class);
 
-                    orderAccountBiz.refundPartDeposit(orderMQDTO);
+                    //租车订单完成
+                    if(OrderTypeEnum.RENT_VEHICLE.getCode().equals(orderMQDTO.getType())) {
+                        orderAccountBiz.refundPartDeposit(orderMQDTO);
+                    }
 
                     executorService.shutdown();
                     Long deliveryTag = (Long) headers.get(AmqpHeaders.DELIVERY_TAG);

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

@@ -1180,17 +1180,19 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     public PageDataVO<UsableVehicleModelVO> searchUsableModel(UsableVeicleDTO dto) {
         Map<String, Object> params = BeanUtil.beanToMap(dto);
         if (StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
-            initBookSearchParam(dto, params, Boolean.FALSE);
+            params = initBookSearchParam(dto, params, Boolean.FALSE);
         }
-        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
+        Map<String, Object> finalParams = params;
+        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(finalParams));
     }
 
     public PageDataVO<UsableVehicleModelVO> searchUsableModelBackStage(UsableVeicleDTO dto) {
         Map<String, Object> params = BeanUtil.beanToMap(dto);
         if (StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
-            initBookSearchParam(dto, params, Boolean.FALSE);
+            params = initBookSearchParam(dto, params, Boolean.FALSE);
         }
-        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
+        Map<String, Object> finalParams = params;
+        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(finalParams));
     }
 
     public PageDataVO<UsableVehicleModelVO> hotModel(HotVeicleDTO dto) {
@@ -1199,7 +1201,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
     }
 
-    private void initBookSearchParam(UsableVeicleDTO dto, Map<String, Object> params, Boolean needDateExtend) {
+    private Map<String, Object> initBookSearchParam(UsableVeicleDTO dto, Map<String, Object> params, Boolean needDateExtend) {
         List<String> notBookedDates = Lists.newArrayList();
         if (StringUtils.isNotBlank(dto.getStartDate()) &&
                 StringUtils.isNotBlank(dto.getEndDate())) {
@@ -1211,6 +1213,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                     dto.getEndDate());
                 dto.setStartDateExtend(dto.getStartDate());
                 dto.setEndDateExtend(dto.getEndDate());
+                params = BeanUtil.beanToMap(dto);
             }
         }
 
@@ -1230,6 +1233,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
 
         //加入预定信息查询条件
         fillBookedDateSearchParam(params, yearMonthAndDate, yearMonthAndDateNotBooked);
+        return params;
     }
 
     public PageDataVO<Vehicle> searchUsableVehicle(RentVehicleBookDTO dto) {
@@ -1238,7 +1242,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             dto.setUseType(null);
         }
 
-        Map<String, Object> params = BeanUtil.beanToMap(dto);
         List<String> notBookedDates = Lists.newArrayList();
         if (StringUtils.isNotBlank(dto.getBookEndDate()) &&
                 StringUtils.isNotBlank(dto.getBookEndDate())) {
@@ -1246,10 +1249,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                     dto.getBookEndDate());
             dto.setStartDateExtend(dto.getBookStartDate());
             dto.setEndDateExtend(dto.getBookEndDate());
+
 //            notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
 //                    dto.getEndDateExtend());
         }
 
+        Map<String, Object> params = BeanUtil.beanToMap(dto);
+
         //若传入预定信息查询条件，则查询对应月份预定信息查询条件（不超过3个月）
         if (CollectionUtils.isEmpty(notBookedDates)) {
             //return;