Merge branch 'master' into dev

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

@@ -72,7 +72,7 @@ public class RentDepositJobHandler 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());
+        Long rentDepositAutoRefundTime = new Long(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
 
         try {
             List<BaseOrder> lists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class)
@@ -80,7 +80,7 @@ public class RentDepositJobHandler extends IJobHandler {
                 .where(WeekendSqls.<BaseOrder>custom().andEqualTo(BaseOrder::getType, OrderTypeEnum.RENT_VEHICLE.getCode())
                         .andEqualTo(BaseOrder::getStatus, OrderStatusEnum.ORDER_FINISH.getCode()) //已完成的订单
                         .andEqualTo(BaseOrder::getRefundStatus, RefundStatusEnum.RESIDUE_ILLEGAL.getCode()) //已归还了部分押金
-                        .andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.date(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)))
+                        .andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.date(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60L * 1000L)))
 //                                    .andLike(BaseOrder::getId, "%"+ i)
                 ).build());
 
@@ -102,7 +102,7 @@ public class RentDepositJobHandler extends IJobHandler {
                     setType(crosstownTypeEnum);
                 }});
 
-                if(crosstown.getCrtTime().compareTo(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)) < 0) {
+                if(crosstown.getCrtTime().compareTo(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60L * 1000L)) < 0) {
                     OrderViolation orderViolation = orderViolationBiz.selectOne(new OrderViolation(){{
                         setDetailId(orvd.getId());
                         setIsDel(SYS_FALSE);

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

@@ -59,4 +59,6 @@ public class VehicleBookRecordQueryVo extends PageParam {
     private List<Integer> companyIds;
     private String upkeepIds;
     private Integer userCompany;
+
+    private Integer zoneId;
 }
\ No newline at end of file

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

@@ -41,7 +41,7 @@
         SELECT r.* FROM (
         select DISTINCT v.`id`,
         v.`code`,
-        (CASE WHEN #{status} != null THEN #{status}
+        (CASE WHEN #{status} is not null THEN #{status}
         ELSE v.status END) status ,
         v.number_plate,
         v.brand,
@@ -184,7 +184,7 @@
         SELECT r.* FROM (
         select DISTINCT v.`id`,
         v.`code`,
-        (CASE WHEN #{status} != null THEN #{status}
+        (CASE WHEN #{status} is not null THEN #{status}
         ELSE v.status END) status ,
         v.number_plate,
         v.brand,