cashier optimization

huanggang
1 parent 01f6a2ee
Showing 4 changed files with 28 additions and 7 deletions
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/DefaultTimeStrategy.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/RcbOnlinePipeline.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/ScanTimeStrategy.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/service/ThreadPoolService.java
 package com.diligrp.cashier.pipeline.core;
-import static com.diligrp.cashier.pipeline.Constants.*;
-
 public class DefaultTimeStrategy implements ScanTimeStrategy {
+
     // 预支付订单扫描时间策略
-    private final long[] prepayTimeArray = { 10 * ONE_MINUTE };
+    private final long[] prepayTimeArray;
     // 直接支付订单扫描时间策略
-    private final long[] paymentTimeArray = { 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 };
+    private final long[] paymentTimeArray;
     // 退款订单扫描时间策略
-    private final long[] refundTimeArray = { ONE_MINUTE, 2 * ONE_MINUTE, 2 * ONE_MINUTE, 5 * ONE_MINUTE };
+    private final long[] refundTimeArray;
+
+    public DefaultTimeStrategy() {
+        this.prepayTimeArray = DEFAULT_PREPAY_TIME_ARRAY;
+        this.paymentTimeArray = DEFAULT_PAYMENT_TIME_ARRAY;
+        this.refundTimeArray = DEFAULT_REFUND_TIME_ARRAY;
+    }
+
+    public DefaultTimeStrategy(long[] prepayTimeArray, long[] paymentTimeArray, long[] refundTimeArray) {
+        this.prepayTimeArray = prepayTimeArray;
+        this.paymentTimeArray = paymentTimeArray;
+        this.refundTimeArray = refundTimeArray;
+    }
     @Override
     public long nextPrepayScanTime(int times) {
@@ -37,7 +37,8 @@ public class RcbOnlinePipeline extends OnlinePipeline&lt;RcbOnlinePipeline.RcbParam
         checkParam(config.getKey(), "key");
         checkParam(config.getNotifyUrl(), "notifyUrl");
         this.client = new RcbOnlineHttpClient(uri, config.getMerchantNo(), config.getTerminalNo(), config.getKey(), config.getAppId());
-        this.strategy = new DefaultTimeStrategy();
+        // 农商行没有退款查询接口不需要退款查询时间策略
+        this.strategy = new DefaultTimeStrategy(ScanTimeStrategy.DEFAULT_PREPAY_TIME_ARRAY, ScanTimeStrategy.DEFAULT_PAYMENT_TIME_ARRAY, new long[0]);
     }
     /**
 package com.diligrp.cashier.pipeline.core;
+import static com.diligrp.cashier.pipeline.Constants.ONE_MINUTE;
+import static com.diligrp.cashier.pipeline.Constants.ONE_SECOND;
+
 public interface ScanTimeStrategy {
+    long[] DEFAULT_PREPAY_TIME_ARRAY = { 10 * ONE_MINUTE };
+
+    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_REFUND_TIME_ARRAY = { ONE_MINUTE, 2 * ONE_MINUTE, 2 * ONE_MINUTE, 5 * ONE_MINUTE };
+
     // 预支付订单延迟扫描时间
     long nextPrepayScanTime(int times);
@@ -29,7 +29,6 @@ public final class ThreadPoolService {
      */
     public static ExecutorService getCpuThreadPoll() {
         if (cpuThreadPoll == null) {
-
             synchronized (ThreadPoolService.class) {
                 if (cpuThreadPoll == null) {
                     cpuThreadPoll = new ThreadPoolExecutor(CPU_CORE_NUM + 1, CPU_MAX_POOL_SIZE, 20,