修改定时代码

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

@@ -67,24 +67,36 @@ public class RemindMsgJobHandler extends IJobHandler {
         try {
             Date tomorrow = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyyy-MM-dd"), 1);
             //检索明天需要出车的订单
-            List<BaseOrder> lists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class)
+            List<BaseOrder> rentLists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class)
                     //订单已完成的租车订单
                     .where(WeekendSqls.<BaseOrder>custom()
-                                    .andIn(BaseOrder::getType, CollectionUtil.newArrayList(OrderTypeEnum.RENT_VEHICLE.getCode(), OrderTypeEnum.TOUR.getCode()))
+                                    .andEqualTo(BaseOrder::getType, OrderTypeEnum.RENT_VEHICLE.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) {
+            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) {
                 AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
-                if(OrderTypeEnum.RENT_VEHICLE.getCode().equals(baseOrder.getType())) {
-                    OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
-                    orderMsgBiz.handelMsgStart(orvd, null, null, baseOrder, appUserDTO);
-                }else {
-                    OrderTourDetail otd = orderTourDetailBiz.selectById(baseOrder.getDetailId());
-                    orderMsgBiz.handelMsgStart(null, otd, null, baseOrder, appUserDTO);
-                }
+
+                OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
+                orderMsgBiz.handelMsgStart(orvd, null, null, baseOrder, appUserDTO);
+            }
+
+            for(BaseOrder baseOrder : tourLists) {
+                AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
+
+                OrderTourDetail otd = orderTourDetailBiz.selectById(baseOrder.getDetailId());
+                orderMsgBiz.handelMsgStart(null, otd, null, baseOrder, appUserDTO);
             }
 
             return ReturnT.SUCCESS;