修改定时代码

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

 package com.xxfc.platform.order.jobhandler;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ArrayUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -66,38 +67,34 @@ public class RemindMsgJobHandler extends IJobHandler {
 
         try {
             Date tomorrow = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyyy-MM-dd"), 1);
+            Date tomorrowBegin = DateUtil.beginOfDay(tomorrow);
+            Date tomorrowEnd = DateUtil.endOfDay(tomorrow);
             //检索明天需要出车的订单
-            List<BaseOrder> rentLists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class)
+            List<BaseOrder> lists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class)
                     //订单已完成的租车订单
                     .where(WeekendSqls.<BaseOrder>custom()
-                                    .andEqualTo(BaseOrder::getType, OrderTypeEnum.RENT_VEHICLE.getCode())
+                                    .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))
+//                                    .andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.beginOfDay(tomorrow))
+//                                    .andGreaterThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.endOfDay(tomorrow))
                     ).build());
 
-            List<BaseOrder> tourLists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class)
-                    //订单已完成的租车订单
-                    .where(WeekendSqls.<BaseOrder>custom()
-                            .andEqualTo(BaseOrder::getType, 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 : rentLists) {
+            for(BaseOrder baseOrder : lists) {
                 AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
-
+                if(OrderTypeEnum.RENT_VEHICLE.getCode().equals(baseOrder.getType())) {
                     OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
+                    DateTime startDate = DateUtil.date(orvd.getStartTime());
+                    if(startDate.isAfterOrEquals(tomorrowBegin) && startDate.isBeforeOrEquals(tomorrowEnd)) {
                         orderMsgBiz.handelMsgStart(orvd, null, null, baseOrder, appUserDTO);
                     }
-
-            for(BaseOrder baseOrder : tourLists) {
-                AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
-
+                }else {
                     OrderTourDetail otd = orderTourDetailBiz.selectById(baseOrder.getDetailId());
+                    DateTime startDate = DateUtil.date(otd.getStartTime());
+                    if(startDate.isAfterOrEquals(tomorrowBegin) && startDate.isBeforeOrEquals(tomorrowEnd)) {
                         orderMsgBiz.handelMsgStart(null, otd, null, baseOrder, appUserDTO);
                     }
+                }
+            }
 
             return ReturnT.SUCCESS;
         } catch (Exception e) {