scan time code optimization

huanggang
1 parent c17e6990
Showing 6 changed files with 43 additions and 30 deletions
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/Constants.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/DefaultTimeStrategy.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/ScanTimeStrategy.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/manager/TaskMessageSender.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/CashierAssistantServiceImpl.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/CashierPaymentServiceImpl.java
@@ -15,12 +15,18 @@ public final class Constants {
     // 农商行聚合支付结果通知URI
     public static final String RCB_PAYMENT_NOTIFY_URI = "%s/rcb/payment/%s/notify.do";
-    public static final long ONE_MINUTE = 60 * 1000;
+    public static final long FIVE_SECONDS = 5;
-    public static final long TEN_MINUTES = 10 * ONE_MINUTE;
+    public static final long TEN_SECONDS = 10;
+
+    public static final long FIFTEEN_SECONDS = 15;
+
+    public static final long ONE_MINUTE = 60; // 单位秒
-    public static final long ONE_SECOND = 1000;
+    public static final long FIVE_MINUTES = 5 * ONE_MINUTE;
+
+    public static final long TEN_MINUTES = 10 * ONE_MINUTE;
-    // 支付通道最小超时时间(单位秒), 一分钟
+    // 支付订单最小超时时间(单位秒), 一分钟
     public static final long MIN_PIPELINE_TIMEOUT = 60;
 }
 package com.diligrp.cashier.pipeline.core;
+import java.time.Duration;
+
 public class DefaultTimeStrategy implements ScanTimeStrategy {
     // 预支付订单扫描时间策略
@@ -24,26 +26,26 @@ public class DefaultTimeStrategy implements ScanTimeStrategy {
     }
     @Override
-    public long nextPrepayScanTime(int times) {
+    public Duration nextPrepayScanTime(int times) {
         if (times - 1 < prepayTimeArray.length) {
-            return prepayTimeArray[times - 1];
+            return Duration.ofSeconds(prepayTimeArray[times - 1]);
         }
-        return -1;
+        return null;
     }
     @Override
-    public long nextPaymentScanTime(int times) {
+    public Duration nextPaymentScanTime(int times) {
         if (times - 1 < paymentTimeArray.length) {
-            return paymentTimeArray[times - 1];
+            return Duration.ofSeconds(paymentTimeArray[times - 1]);
         }
-        return -1;
+        return null;
     }
     @Override
-    public long nextRefundScanTime(int times) {
+    public Duration nextRefundScanTime(int times) {
         if (times - 1 < refundTimeArray.length) {
-            return refundTimeArray[times - 1];
+            return Duration.ofSeconds(refundTimeArray[times - 1]);
         }
-        return -1;
+        return null;
     }
 }
 package com.diligrp.cashier.pipeline.core;
-import static com.diligrp.cashier.pipeline.Constants.ONE_MINUTE;
-import static com.diligrp.cashier.pipeline.Constants.ONE_SECOND;
+import java.time.Duration;
+
+import static com.diligrp.cashier.pipeline.Constants.*;
 public interface ScanTimeStrategy {
-    long[] DEFAULT_PREPAY_TIME_ARRAY = { 10 * ONE_MINUTE };
+    long[] DEFAULT_PREPAY_TIME_ARRAY = { TEN_MINUTES };
-    long[] DEFAULT_PAYMENT_TIME_ARRAY = { 5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND,
-        5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND, 10 * ONE_SECOND, 15 * ONE_SECOND };
+    long[] DEFAULT_PAYMENT_TIME_ARRAY = { FIVE_SECONDS, FIVE_SECONDS, FIVE_SECONDS, FIVE_SECONDS, FIVE_SECONDS,
+            FIVE_SECONDS, FIVE_SECONDS, FIVE_SECONDS, TEN_SECONDS, FIFTEEN_SECONDS };
-    long[] DEFAULT_REFUND_TIME_ARRAY = { ONE_MINUTE, 2 * ONE_MINUTE, 2 * ONE_MINUTE, 5 * ONE_MINUTE };
+    long[] DEFAULT_REFUND_TIME_ARRAY = { ONE_MINUTE, 2 * ONE_MINUTE, 2 * ONE_MINUTE, FIVE_MINUTES };
     // 预支付订单延迟扫描时间
-    long nextPrepayScanTime(int times);
+    Duration nextPrepayScanTime(int times);
     // 支付订单延迟扫描时间
-    long nextPaymentScanTime(int times);
+    Duration nextPaymentScanTime(int times);
     // 退款订单延迟扫描时间
-    long nextRefundScanTime(int times);
+    Duration nextRefundScanTime(int times);
 }
@@ -13,6 +13,8 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.Objects;
 @Service("taskMessageSender")
 public class TaskMessageSender {
@@ -26,8 +28,8 @@ public class TaskMessageSender {
     /**
      * 发送延时处理消息
      */
-    public void sendDelayTaskMessage(TaskMessage task, long delayInMillis) {
-        if (delayInMillis < 0) {
+    public void sendDelayTaskMessage(TaskMessage task, Duration duration) {
+        if (Objects.isNull(duration)) {
             LOG.debug("No need send scan order message: {}", task);
             return;
         }
@@ -39,7 +41,7 @@ public class TaskMessageSender {
                 properties.setContentType(MessageProperties.CONTENT_TYPE_BYTES);
                 // properties.setExpiration(String.valueOf(expiredTime));
                 // RabbitMQ延时插件必须设置x-delay的header才能生效
-                properties.setHeader("x-delay", String.valueOf(delayInMillis));
+                properties.setHeader("x-delay", String.valueOf(duration.toMillis()));
                 String payload = JsonUtils.toJsonString(task);
                 Message message = new Message(payload.getBytes(StandardCharsets.UTF_8), properties);
                 LOG.debug("Sending async delay task message: {}", task.getPayload());
@@ -26,6 +26,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -114,9 +115,9 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
         OnlineRefundResponse response = pipeline.queryRefundResponse(order);
         cashierPaymentService.notifyRefundResult(refund, response);
         if (!PaymentState.isFinished(response.getState().getCode())) {
-            long delay = pipeline.getTimeStrategy().nextRefundScanTime(times + 1);
+            Duration duration = pipeline.getTimeStrategy().nextRefundScanTime(times + 1);
             TaskMessage message = new TaskMessage(TaskMessage.TYPE_CASHIER_REFUND_SCAN, refundId, String.valueOf(times + 1));
-            taskMessageSender.sendDelayTaskMessage(message, delay);
+            taskMessageSender.sendDelayTaskMessage(message, duration);
         }
     }
 }
@@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
@@ -98,7 +99,7 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
         // 兜底处理交易订单，根据支付结果选择关闭或完成交易订单
         TaskMessage message = new TaskMessage(TaskMessage.TYPE_CASHIER_ORDER_SCAN, tradeId, "1");
-        taskMessageSender.sendDelayTaskMessage(message, timeout * 1000); // 转换成毫秒
+        taskMessageSender.sendDelayTaskMessage(message, Duration.ofSeconds(timeout));
         return tradeId;
     }
@@ -365,9 +366,9 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
         } else if (!PaymentState.isFinished(response.getState().getCode())) {
             // 固定周期后，查询退款状态，根据状态完成退款订单
             if (pipeline instanceof OnlinePipeline<?> onlinePipeline) { // 只有在线支付通道允许查询退款状态
-                long delay = onlinePipeline.getTimeStrategy().nextRefundScanTime(1);
+                Duration duration = onlinePipeline.getTimeStrategy().nextRefundScanTime(1);
                 TaskMessage message = new TaskMessage(TaskMessage.TYPE_CASHIER_REFUND_SCAN, refundId, "1");
-                taskMessageSender.sendDelayTaskMessage(message, delay);
+                taskMessageSender.sendDelayTaskMessage(message, duration);
             }
         }