Commit 67091dbc authored by 周健威's avatar 周健威

修改定时代码

parent c802c52c
package com.xxfc.platform.order.jobhandler; package com.xxfc.platform.order.jobhandler;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
import com.github.wxiaoqi.security.admin.feign.UserFeign; import com.github.wxiaoqi.security.admin.feign.UserFeign;
...@@ -66,37 +67,33 @@ public class RemindMsgJobHandler extends IJobHandler { ...@@ -66,37 +67,33 @@ public class RemindMsgJobHandler extends IJobHandler {
try { try {
Date tomorrow = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyyy-MM-dd"), 1); 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() .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()) //待出发的订单 .andEqualTo(BaseOrder::getStatus, OrderStatusEnum.ORDER_TOSTART.getCode()) //待出发的订单
.andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.beginOfDay(tomorrow)) // .andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.beginOfDay(tomorrow))
.andGreaterThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.endOfDay(tomorrow)) // .andGreaterThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.endOfDay(tomorrow))
).build()); ).build());
List<BaseOrder> tourLists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class) for(BaseOrder baseOrder : lists) {
//订单已完成的租车订单
.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(); AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
if(OrderTypeEnum.RENT_VEHICLE.getCode().equals(baseOrder.getType())) {
OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectById(baseOrder.getDetailId()); OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
orderMsgBiz.handelMsgStart(orvd, null, null, baseOrder, appUserDTO); 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());
OrderTourDetail otd = orderTourDetailBiz.selectById(baseOrder.getDetailId()); DateTime startDate = DateUtil.date(otd.getStartTime());
orderMsgBiz.handelMsgStart(null, otd, null, baseOrder, appUserDTO); if(startDate.isAfterOrEquals(tomorrowBegin) && startDate.isBeforeOrEquals(tomorrowEnd)) {
orderMsgBiz.handelMsgStart(null, otd, null, baseOrder, appUserDTO);
}
}
} }
return ReturnT.SUCCESS; return ReturnT.SUCCESS;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment