From c61bcfa5c163d0a3ee87db12c64a5c9d12c44d8d Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 21 Oct 2021 17:49:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=87=AA=E5=8A=A8=E5=A5=BD?= =?UTF-8?q?=E8=AF=84=EF=BC=8C=E8=AE=A2=E5=8D=95=E8=87=AA=E5=8A=A8=E5=A5=BD?= =?UTF-8?q?=E8=AF=84=E6=9D=A1=E4=BB=B6=E5=88=A4=E5=AE=9A=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/impl/order/OrderEveryDayTaskExecute.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java index 24260fd8b..f24ee9e18 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/OrderEveryDayTaskExecute.java @@ -99,13 +99,14 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { */ private void completedOrder(OrderSetting orderSetting) { + //订单自动收货时间 = 当前时间 - 自动收货时间天数 DateTime receiveTime = DateUtil.offsetDay(DateUtil.date(), -orderSetting.getAutoReceive()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Order::getOrderStatus, OrderStatusEnum.DELIVERED.name()); //订单发货时间 >= 订单自动收货时间 - queryWrapper.ge(Order::getLogisticsTime, receiveTime); + queryWrapper.le(Order::getLogisticsTime, receiveTime); List list = orderService.list(queryWrapper); //判断是否有符合条件的订单，进行订单完成处理 @@ -128,7 +129,7 @@ public class OrderEveryDayTaskExecute implements EveryDayExecute { //订单完成时间 <= 订单自动好评时间 QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.ge("o.complete_time", receiveTime); + queryWrapper.le("o.complete_time", receiveTime); queryWrapper.eq("oi.comment_status", CommentStatusEnum.UNFINISHED.name()); List orderItems = orderItemMapper.waitOperationOrderItem(queryWrapper);