Merge branch 'master-zjw' into dev

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

@@ -388,8 +388,21 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             }}), VehicleItemDTO.class);
 
             if(null == crosstown) {
+                //设置等待时间 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()
                     || crosstown.getRestDeposit().subtract(illegalReserve).compareTo(BigDecimal.ZERO) < 0 ){