修改订单超时取消定时任务

pom.xml

@@ -118,8 +118,9 @@
                 <nacos.username>nacos</nacos.username>
                 <nacos.password>nacos</nacos.password>
                 <logstash.address>127.0.0.1:4560</logstash.address>
-                <discovery.ip>192.168.1.140</discovery.ip>
+                <discovery.ip>127.0.0.1</discovery.ip>
                 <mysql.password>Yr7777777</mysql.password>
+                <nacos.ip>127.0.0.1</nacos.ip>
             </properties>
         </profile>
     </profiles>

ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/OrderCancelTask.java

@@ -18,20 +18,20 @@ public class OrderCancelTask {
 
     public ExecuteResult jobExecute(JobArgs jobArgs) {
 
-        log.info("开始进行门店到期状态任务");
+        log.info("开始进行订单超时任务");
 
         try {
             boolean flag = remoteSubOrderService.timeoutCancel();
             if (!flag) {
-                return ExecuteResult.failure("门店到期任务执行失败");
+                return ExecuteResult.failure("订单超时任务执行失败");
             }
         } catch (Exception e) {
-            return ExecuteResult.failure("门店到期任务执行失败 : " + e);
+            return ExecuteResult.failure("订单超时任务执行失败 : " + e);
         }
 
-        log.info("结束门店到期状态任务");
+        log.info("结束订单超时状态任务");
 
-        return ExecuteResult.success("门店到期任务执行成功");
+        return ExecuteResult.success("订单超时任务执行成功");
     }
 
 }

ruoyi-modules/yingpaipay-fulfiller/src/main/java/org/dromara/fulfiller/dubbo/RemoteFulfillerServiceImpl.java

@@ -257,7 +257,7 @@ public class RemoteFulfillerServiceImpl implements RemoteFulfillerService {
 
         }
 
-        return fulfillerMapper.updateBatchById(fulfillers);
+        return fulfillers.isEmpty() || fulfillerMapper.updateBatchById(fulfillers);
     }
 
     @Override

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/dubbo/RemoteSubOrderServiceImpl.java

@@ -348,7 +348,7 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
 
                 long mins = Duration.between(time, LocalDateTime.now()).toMinutes();
 
-                if (mins > timeout) {
+                if (mins >= timeout) {
                     order.setStatus(OrderStatusEnum.CANCELLED.getValue());
                     cancels.add(order);
                 }
@@ -368,7 +368,7 @@ public class RemoteSubOrderServiceImpl implements RemoteSubOrderService {
                 log.setLogType(OrderLogTypeEnum.ORDER.getValue());
                 log.setStep(OrderLogSystemStepEnum.CANCEL.getStep());
                 log.setTitle("超时取消");
-                log.setContent("履约者超过" + timeout + "分钟未结单,系统自动取消");
+                log.setContent("履约者超时未接单,系统自动取消");
                 log.setTenantId(order.getTenantId());
                 log.setCreateBy(SystemConstants.SUPER_ADMIN_ID);
                 log.setCreateTime(new Date());