Merge branch 'master-zjw' into dev

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) {