upgrade after testing

huanggang
1 parent e2a07d8f
Showing 10 changed files with 94 additions and 124 deletions
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/CardPaymentHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/RcbOnlineHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/DefaultTimeStrategy.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/service/ThreadPoolService.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/manager/PaymentResultManager.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/manager/TaskMessageConsumer.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
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/TradeAssistantServiceImpl.java
@@ -68,7 +68,7 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
         LocalDateTime now = LocalDateTime.now();
         HttpResult result = send(uri, payload);
         if (result.statusCode == 200) {
-            LOG.debug("Received from card payment pipeline: {}\n{}", request.getPaymentId(), result.responseText);
+            LOG.debug("Card payment response received: {}\n{}", request.getPaymentId(), result.responseText);
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             if ("200".equals(response.get("code"))) {
                 Map<String, Object> data = (Map<String, Object>) response.get("data");
@@ -99,7 +99,7 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
         LocalDateTime now = LocalDateTime.now();
         HttpResult result = send(uri, payload);
         if (result.statusCode == 200) {
-            LOG.debug("Received from card payment pipeline: {}\n", request.getRefundId(), result.responseText);
+            LOG.debug("Card refund response received: {}\n{}", request.getRefundId(), result.responseText);
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             if ("200".equals(response.get("code"))) {
                 return new OnlineRefundResponse(request.getRefundId(), null, now,
@@ -121,7 +121,7 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
         LOG.debug("Sending list user card request: {}\n{}", userId, payload);
         HttpResult result = send(uri, payload);
         if (result.statusCode == 200) {
-            LOG.debug("Received from card payment pipeline: {}\n{}", userId, result.responseText);
+            LOG.debug("List user card response received: {}\n{}", userId, result.responseText);
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             if ("200".equals(response.get("code"))) {
                 List<UserCardDTO> userCards = new ArrayList<>();
@@ -11,7 +11,6 @@
  import com.diligrp.cashier.shared.service.ServiceEndpointSupport;
  import com.diligrp.cashier.shared.util.*;
  import com.fasterxml.jackson.core.type.TypeReference;
- import jakarta.annotation.Resource;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  import org.springframework.dao.DataAccessException;
@@ -38,11 +37,6 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
     private static final Logger LOG = LoggerFactory.getLogger(RcbOnlineHttpClient.class);
-    // 微信API BASE URL
-    private static final String WECHAT_BASE_URL = "https://api.weixin.qq.com";
-    // code2session接口: 根据登录凭证code获取登录信息
-    private static final String CODE_TO_SESSION = "/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code";
-
     private static final int STATUS_OK = 200;
     private final String uri;
@@ -89,7 +83,7 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
              LOG.error("Failed to send rcb MiniPro prepay request: {}", result.statusCode);
              throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "调用小程序预支付接口失败: " + result.statusCode);
          }
-         LOG.debug("Received from rcb MiniPro pipeline: {}\n{}", request.getPaymentId(), result.responseText);
+         LOG.debug("Rcb MiniPro prepay received: {}\n{}", request.getPaymentId(), result.responseText);
          Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
          String resultCode = data.get("resultCode");
@@ -117,13 +111,13 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
         params.put("sign", RcbSignatureUtils.sign(params, key));
         String payload = JsonUtils.toJsonString(params);
-        LOG.info("Sending rcb query prepay order state request: {}", request.getPaymentId());
+        LOG.info("Sending query rcb prepay order request: {}", request.getPaymentId());
         HttpResult result = send(uri + "/cposp/pay/orderQuery", payload);
         if (result.statusCode != STATUS_OK) {
-            LOG.error("Failed to query rcb prepay order state: {}", result.statusCode);
+            LOG.error("Failed to query rcb prepay order: {}", result.statusCode);
             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "查询支付状态失败: " + result.statusCode);
         }
-        LOG.debug("Received from rcb online pipeline: {}\n{}", request.getPaymentId(), result.responseText);
+        LOG.debug("Query rcb prepay order response received: {}\n{}", request.getPaymentId(), result.responseText);
         Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
         String signature = data.remove("sign");
@@ -175,7 +169,7 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
              LOG.error("Failed to close rcb prepay order: {}", request.getPaymentId());
              throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "关闭支付订单失败: " + result.statusCode);
          }
-         LOG.debug("Received from rcb online pipeline: {}\n{}", request.getPaymentId(), result.responseText);
+         LOG.debug("Close rcb prepay order response received: {}\n{}", request.getPaymentId(), result.responseText);
          Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
          String resultCode = data.get("resultCode");
@@ -212,7 +206,7 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
             LOG.error("Failed to send rcb refund request: {}", request.getRefundId());
             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发送退款请求失败: " + result.statusCode);
         }
-        LOG.debug("Received from rcb online pipeline: {}\n{}", request.getRefundId(), result.responseText);
+        LOG.debug("Rcb payment refund response received: {}\n{}", request.getRefundId(), result.responseText);
         Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
         String resultCode = data.get("resultCode");
@@ -252,7 +246,7 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
                 LOG.error("Failed to get rcb batch no, statusCode: {}", result.statusCode);
                 throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "获取签到批次号: " + result.statusCode);
             }
-            LOG.debug("Received from rcb online pipeline: {}", result.responseText);
+            LOG.debug("Rcb signIn response received: {}", result.responseText);
             Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             String resultCode = data.get("resultCode");
@@ -262,13 +256,13 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
                 stringRedisTemplate.opsForValue().set(key, batchNo, 36 * 60 * 60, TimeUnit.SECONDS);
                 return batchNo;
             } else {
-                LOG.error("Failed to rcb sign in, errorCode: {}, resultMessage: {}", resultCode, resultMessage);
-                throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "签到接口调用失败");
+                LOG.error("Failed to rcb signIn: {}", result.responseText);
+                throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "签到接口调用失败: " + resultMessage);
             }
         } catch (ServiceAccessException | PaymentPipelineException rex) {
             throw rex;
         } catch (Exception ex) {
-            LOG.error("Failed to get rcb sign in batchNo", ex);
+            LOG.error("Failed to rcb signIn", ex);
             throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "获取签到批次号失败");
         }
     }
@@ -326,57 +320,4 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
          }
          return Optional.ofNullable(sslContext);
      }
-
-    private static class AuthorizationSession {
-        // 用户唯一标识
-        private String openid;
-        // 会话密钥
-        private String session_key;
-        // 用户在开放平台的唯一标识
-        private String unionid;
-        // 错误码
-        private Integer errcode;
-        // 错误信息
-        private String errmsg;
-
-        public String getOpenid() {
-            return openid;
-        }
-
-        public void setOpenid(String openid) {
-            this.openid = openid;
-        }
-
-        public String getSession_key() {
-            return session_key;
-        }
-
-        public void setSession_key(String session_key) {
-            this.session_key = session_key;
-        }
-
-        public String getUnionid() {
-            return unionid;
-        }
-
-        public void setUnionid(String unionid) {
-            this.unionid = unionid;
-        }
-
-        public Integer getErrcode() {
-            return errcode;
-        }
-
-        public void setErrcode(Integer errcode) {
-            this.errcode = errcode;
-        }
-
-        public String getErrmsg() {
-            return errmsg;
-        }
-
-        public void setErrmsg(String errmsg) {
-            this.errmsg = errmsg;
-        }
-    }
 }
@@ -7,10 +7,10 @@ public class DefaultTimeStrategy implements ScanTimeStrategy {
     private final long[] prepayTimeArray = { 10 * ONE_MINUTE };
     // 直接支付订单扫描时间策略
-    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 = { 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[] refundTimeArray = { 10 * ONE_MINUTE };
+    private final long[] refundTimeArray = { ONE_MINUTE, 2 * ONE_MINUTE, 2 * ONE_MINUTE, 5 * ONE_MINUTE };
     @Override
     public long nextPrepayScanTime(int times) {
 package com.diligrp.cashier.shared.service;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 /**
  * 请谨慎使用此线程池工具类，通常建议根据特定的使用场景设置线程池参数，不建议使用统一的线程池配置
- * JDK的线程池类并不能很好区分"计算密集型"和"IO密集型"任务类型，并根据不同的任务类型去配置不同的参数
+ * JDK的线程池类并不能很好区分"计算密集型"和"IO密集型"任务类型，应该根据不同的任务类型去配置不同的参数
  */
 public final class ThreadPoolService {
@@ -15,7 +12,7 @@ public final class ThreadPoolService {
     private static final int CPU_MAX_POOL_SIZE = 100;
-    private static final int IO_MAX_POOL_SIZE = 1000;
+//    private static final int IO_MAX_POOL_SIZE = 1000;
     // CPU运算密集型任务的线程池实例
     private static volatile ExecutorService cpuThreadPoll;
@@ -32,11 +29,11 @@ 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, TimeUnit.SECONDS, new LinkedBlockingQueue<>(100),
-                        new ThreadPoolExecutor.AbortPolicy());
+                    cpuThreadPoll = new ThreadPoolExecutor(CPU_CORE_NUM + 1, CPU_MAX_POOL_SIZE, 20,
+                        TimeUnit.SECONDS, new LinkedBlockingQueue<>(100), new LazyRejectedExecutionHandler());
                 }
             }
         }
@@ -51,12 +48,29 @@ public final class ThreadPoolService {
         if (ioThreadPoll == null) {
             synchronized (ThreadPoolService.class) {
                 if (ioThreadPoll == null) {
-                    ioThreadPoll = new ThreadPoolExecutor(CPU_CORE_NUM + 1, IO_MAX_POOL_SIZE,
-                        20, TimeUnit.SECONDS, new LinkedBlockingQueue<>(1000),
-                        new ThreadPoolExecutor.AbortPolicy());
+                    ioThreadPoll = Executors.newVirtualThreadPerTaskExecutor();
+
+//                    ioThreadPoll = new ThreadPoolExecutor(CPU_CORE_NUM + 1, IO_MAX_POOL_SIZE, 20,
+//                        TimeUnit.SECONDS, new LinkedBlockingQueue<>(1000), new LazyRejectedExecutionHandler());
                 }
             }
         }
         return ioThreadPoll;
     }
+
+    private static class LazyRejectedExecutionHandler implements RejectedExecutionHandler {
+        @Override
+        public void rejectedExecution(Runnable task, ThreadPoolExecutor executor) {
+            boolean success = false;
+            try {
+                success = executor.getQueue().offer(task, 15, TimeUnit.SECONDS);
+            } catch (InterruptedException ex) {
+                Thread.currentThread().interrupt();
+            }
+
+            if (!success) {
+                throw new RejectedExecutionException("task queue is full");
+            }
+        }
+    }
 }
@@ -86,7 +86,7 @@ public class PaymentResultManager {
                     try {
                         listener.onEvent(refundEvent);
                     } catch (Exception ex) {
-                        LOG.error("Failed to notify trade refund result", ex);
+                        LOG.error("Failed to notify payment refund result", ex);
                     }
                 }
             }
@@ -95,13 +95,13 @@ public class PaymentResultManager {
                 ThreadPoolService.getIoThreadPoll().submit(() -> {
                     try {
                         String payload = JsonUtils.toJsonString(refundResult);
-                        LOG.info("Notifying online trade refund result: {}", payload);
+                        LOG.info("Notifying online payment refund result: {}", payload);
                         ServiceEndpointSupport.HttpResult httpResult = new NotifyHttpClient(uri).send(payload);
                         if (httpResult.statusCode != 200) {
-                            LOG.error("Failed to notify trade refund result");
+                            LOG.error("Failed to notify payment refund result");
                         }
                     } catch (Exception ex) {
-                        LOG.error("Failed to notify trade refund result", ex);
+                        LOG.error("Failed to notify payment refund result", ex);
                     }
                 });
             }
@@ -35,7 +35,7 @@ public class TaskMessageConsumer {
                 ? properties.getContentEncoding() : StandardCharsets.UTF_8.name();
         try {
             String body = new String(packet, charSet);
-            LOG.info("Receiving async delay task message: {}", body);
+            LOG.debug("Receiving async delay task message: {}", body);
             TaskMessage task = TaskMessage.fromJson(body);
             int times = NumberUtils.str2Int(task.getParams(), Integer.MAX_VALUE);
             if (task.getType() == TaskMessage.TYPE_CASHIER_ORDER_SCAN) {
@@ -19,11 +19,6 @@ public class TaskMessageSender {
     private static final Logger LOG = LoggerFactory.getLogger(TaskMessageSender.class);
-    private static final long ONE_MINUTE = 60 * 1000;
-
-    private static final long TEN_MINUTES = 10 * ONE_MINUTE;
-
-    private static final long ONE_SECOND = 1000;
     @Resource
     private RabbitTemplate rabbitTemplate;
@@ -33,7 +28,7 @@ public class TaskMessageSender {
      */
     public void sendDelayTaskMessage(TaskMessage task, long delayInMillis) {
         if (delayInMillis < 0) {
-            LOG.info("No need send scan order message: {}", task);
+            LOG.debug("No need send scan order message: {}", task);
             return;
         }
@@ -47,7 +42,7 @@ public class TaskMessageSender {
                 properties.setHeader("x-delay", String.valueOf(delayInMillis));
                 String payload = JsonUtils.toJsonString(task);
                 Message message = new Message(payload.getBytes(StandardCharsets.UTF_8), properties);
-                LOG.info("Sending async delay task message: {}", task.getPayload());
+                LOG.debug("Sending async delay task message: {}", task.getPayload());
                 rabbitTemplate.send(Constants.PAYMENT_DELAY_EXCHANGE, Constants.PAYMENT_DELAY_KEY, message);
             } catch (Exception ex) {
                 LOG.error("Failed to send async delay task message: {}", task.getPayload(), ex);
@@ -10,7 +10,9 @@ import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
 import com.diligrp.cashier.pipeline.type.PaymentState;
 import com.diligrp.cashier.trade.Constants;
 import com.diligrp.cashier.trade.dao.IOnlinePaymentDao;
+import com.diligrp.cashier.trade.domain.TaskMessage;
 import com.diligrp.cashier.trade.domain.TradeStateDTO;
+import com.diligrp.cashier.trade.manager.TaskMessageSender;
 import com.diligrp.cashier.trade.model.OnlinePayment;
 import com.diligrp.cashier.trade.model.TradeOrder;
 import com.diligrp.cashier.trade.service.ICashierAssistantService;
@@ -45,11 +47,14 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
     private TradeAssistantServiceImpl tradeAssistantService;
     @Resource
+    private TaskMessageSender taskMessageSender;
+
+    @Resource
     private RedissonClient redissonClient;
     @Override
     public void scanCashierTradeOrder(String tradeId, int times) {
-        LOG.debug("scanCashierTradeOrder{}: processing cashier trade order {}", times, tradeId);
+        LOG.info("scanCashierTradeOrder{}: processing cashier order {}", times, tradeId);
         String lockKey = String.format(Constants.TRADE_LOCK_REDIS_KEY, tradeId);
         RLock lock = redissonClient.getLock(lockKey);
         try {
@@ -64,12 +69,11 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
                 // 在线支付通道才能关闭订单, 园区卡支付不支持
                 if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
                     OnlinePrepayOrder order = new OnlinePrepayOrder(payment.getPaymentId(), payment.getOutTradeNo());
-                    // 微信服务商模式，还需子商户
                     OnlinePaymentResponse response = onlinePipeline.queryPrepayResponse(order);
                     if (!PaymentState.isFinished(response.getState().getCode())) {
                         try {
                             onlinePipeline.closePrepayOrder(order);
-                            LOG.info("scanCashierTradeOrder: close online prepay order {}", payment.getPaymentId());
+                            LOG.debug("scanCashierTradeOrder: close online prepay order {}", payment.getPaymentId());
                             response = new OnlinePaymentResponse(response.getPaymentId(), response.getOutTradeNo(),
                                 response.getOutPayType(), response.getPayerId(), response.getWhen(),
                                 PaymentState.FAILED, "自动关闭超时的支付订单");
@@ -85,7 +89,9 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
             if (!TradeState.isFinished(trade.getState())) {
                 TradeStateDTO tradeStateDTO = TradeStateDTO.of(trade.getTradeId(), TradeState.CLOSED, trade.getVersion(), now);
                 tradeAssistantService.proceedTradeOrder(tradeStateDTO);
-                LOG.info("scanCashierTradeOrder: close cashier trade order {}", tradeId);
+                LOG.debug("scanCashierTradeOrder: close cashier order {}", tradeId);
+            } else {
+                LOG.debug("scanCashierTradeOrder: cashier order {} already accomplished", trade.getTradeId());
             }
         } finally {
             if (lock.isHeldByCurrentThread()) {
@@ -96,10 +102,10 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
     @Override
     public void scanCashierRefundOrder(String refundId, int times) {
-        LOG.debug("scanCashierRefundOrder{}: processing online refund order {}", times, refundId);
+        LOG.info("scanCashierRefundOrder{}: processing cashier refund order {}", times, refundId);
         OnlinePayment refund = tradeAssistantService.findByRefundId(refundId);
         if (PaymentState.isFinished(refund.getState())) {
-            LOG.debug("scanCashierRefundOrder{}: online refund order {} already accomplished", times, refundId);
+            LOG.debug("scanCashierRefundOrder{}: cashier refund order {} already accomplished", times, refundId);
             return;
         }
@@ -107,5 +113,10 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
         OnlineRefundOrder order = new OnlineRefundOrder(refundId, refund.getOutTradeNo());
         OnlineRefundResponse response = pipeline.queryRefundResponse(order);
         cashierPaymentService.notifyRefundResult(response);
+        if (!PaymentState.isFinished(response.getState().getCode())) {
+            long delay = pipeline.getTimeStrategy().nextRefundScanTime(times + 1);
+            TaskMessage message = new TaskMessage(TaskMessage.TYPE_CASHIER_REFUND_SCAN, refundId, String.valueOf(times + 1));
+            taskMessageSender.sendDelayTaskMessage(message, delay);
+        }
     }
 }
@@ -5,6 +5,7 @@ import com.diligrp.cashier.assistant.service.impl.SnowflakeKeyManager;
 import com.diligrp.cashier.pipeline.core.DiliCardPipeline;
 import com.diligrp.cashier.pipeline.core.OnlinePipeline;
 import com.diligrp.cashier.pipeline.core.PaymentPipeline;
+import com.diligrp.cashier.pipeline.core.ScanTimeStrategy;
 import com.diligrp.cashier.pipeline.domain.*;
 import com.diligrp.cashier.pipeline.domain.card.CardPaymentRequest;
 import com.diligrp.cashier.pipeline.domain.card.CardPaymentResponse;
@@ -104,19 +105,19 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
     /**
      * 收银台支付
      *
-     * @param cashierPayment - 支付信息
+     * @param payment - 支付信息
      * @return 支付状态
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public OnlinePaymentStatus doPayment(CashierPayment cashierPayment) {
+    public OnlinePaymentStatus doPayment(CashierPayment payment) {
         // TODO: 接口防重复提交
-        String lockKey = String.format(Constants.TRADE_LOCK_REDIS_KEY, cashierPayment.getTradeId());
+        String lockKey = String.format(Constants.TRADE_LOCK_REDIS_KEY, payment.getTradeId());
         RLock lock = redissonClient.getLock(lockKey);
         try {
             boolean locked = lock.tryLock(Constants.TRADE_LOCK_TIMEOUT, TimeUnit.SECONDS);
             if (locked) {
-                TradeOrder trade = tradeAssistantService.findByTradeId(cashierPayment.getTradeId());
+                TradeOrder trade = tradeAssistantService.findByTradeId(payment.getTradeId());
                 CashierType cashierType = CashierType.getByCode(trade.getType());
                 if (TradeState.isFinished(trade.getState())) {
                     throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不能进行支付, 交易订单已经完成");
@@ -125,6 +126,7 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                 if (cashierType != CashierType.MINIPRO) {
                     throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "系统当前不支持的此收银台类型");
                 }
+                LOG.info("Requesting cashier order payment: {}", payment.getTradeId());
                 // 关闭支付中的支付订单, 避免一个交易订单存在多笔支付订单, 造成重复支付
                 if (!tradeAssistantService.resetTradeOrder(trade)) {
                     throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不能进行支付, 交易订单正在支付中");
@@ -132,26 +134,26 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                 LocalDateTime now = LocalDateTime.now();
                 // 获取支付通道
-                PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(
-                    cashierPayment.getPipelineId(), PaymentPipeline.class);
+                PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.class);
                 String paymentId = snowflakeKeyManager.getKeyGenerator(SnowflakeKey.PAYMENT_ID).nextId();
                 if (pipeline instanceof OnlinePipeline<?> onlinePipeline) { // 在线支付通道
                     // 在线支付通道: 不同的收银台类型使用不同的支付方式(目前只支持小程序收银台)
                     // 小程序收银台将使用在线支付通道的小程序支付
-                    MiniProPrepayRequest request = new MiniProPaymentConverter(trade, paymentId, now).convert(cashierPayment);
+                    MiniProPrepayRequest request = new MiniProPaymentConverter(trade, paymentId, now).convert(payment);
                     MiniProPrepayResponse response = onlinePipeline.sendMiniProPrepayRequest(request);
                     String outMchId = request.getString(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID);
-                    OnlinePayment payment = OnlinePayment.builder().outMchId(outMchId).tradeId(trade.getTradeId())
+                    OnlinePayment onlinePayment = OnlinePayment.builder().outMchId(outMchId).tradeId(trade.getTradeId())
                         .type(TradeType.TRADE).paymentId(paymentId).channelId(onlinePipeline.supportedChannel())
                         .payType(PaymentType.MINI_PRO).pipelineId(onlinePipeline.pipelineId()).goods(trade.getGoods())
                         .amount(trade.getAmount()).payerId(request.getOpenId()).outTradeNo(response.getOutTradeNo())
                         .outPayType(OutPaymentType.NOP).finishTime(null).state(response.getState())
                         .notifyUrl(trade.getNotifyUrl()).description(null).version(0).createdTime(now).modifiedTime(now).build();
-                    onlinePaymentDao.insertOnlinePayment(payment);
+                    onlinePaymentDao.insertOnlinePayment(onlinePayment);
+                    LOG.debug("Cashier order payment result: {}:{}", response.getPaymentId(), response.getState().name());
                     return response;
                 } else if (pipeline instanceof DiliCardPipeline cardPipeline) { // 园区卡支付通道
                     // 园区卡支付通道: 所有的收银台类型使用的是同一种园区卡支付流程
-                    CardPaymentRequest request = new CardPaymentConverter(trade, paymentId, now).convert(cashierPayment);
+                    CardPaymentRequest request = new CardPaymentConverter(trade, paymentId, now).convert(payment);
                     // 园区卡支付需要订单来源
                     request.attach("source", SourceType.getIfNonNull(trade.getSource()));
                     // 修改支付状态为支付中，防止重复支付
@@ -160,14 +162,14 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                     if (response.getState() == PaymentState.SUCCESS) {
                         // 园区卡支付通道outMchId为市场ID
                         String outMchId = request.getString(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID);
-                        OnlinePayment payment = OnlinePayment.builder().outMchId(outMchId).tradeId(trade.getTradeId())
+                        OnlinePayment onlinePayment = OnlinePayment.builder().outMchId(outMchId).tradeId(trade.getTradeId())
                             .type(TradeType.TRADE).paymentId(paymentId).channelId(cardPipeline.supportedChannel())
                             .payType(PaymentType.DIRECT).pipelineId(cardPipeline.pipelineId()).goods(trade.getGoods())
                             .amount(trade.getAmount()).payerId(response.getPayerId()).outTradeNo(response.getOutTradeNo())
                             .outPayType(response.getOutPayType()).finishTime(response.getWhen()).state(response.getState())
                             .notifyUrl(trade.getNotifyUrl()).description(response.getMessage()).version(0)
                             .createdTime(now).modifiedTime(now).build();
-                        onlinePaymentDao.insertOnlinePayment(payment);
+                        onlinePaymentDao.insertOnlinePayment(onlinePayment);
                         TradeStateDTO tradeStateDTO = TradeStateDTO.of(trade.getTradeId(), TradeState.SUCCESS,
                             trade.getVersion(), now);
@@ -178,6 +180,7 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                             response.getPayerId(), response.getWhen(), response.getMessage());
                         paymentResultManager.notifyPaymentResult(trade.getNotifyUrl(), paymentResult, 500);
                     }
+                    LOG.debug("Cashier order payment result: {}:{}", response.getPaymentId(), response.getState().name());
                     return response;
                 } else {
                     // 目前只有两类支付通道: CardPipeline和OnlinePipeline, 程序逻辑不应该到达此代码块
@@ -205,10 +208,10 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
     public void notifyPaymentResponse(OnlinePaymentResponse response) {
         OnlinePayment payment = tradeAssistantService.findByPaymentId(response.getPaymentId());
         if (PaymentState.isFinished(payment.getState())) {
-            LOG.warn("Duplicate process payment response: [{}:{}]", payment.getPaymentId(), response.getState());
+            LOG.warn("Duplicate process cashier payment response: [{}:{}]", payment.getPaymentId(), response.getState().name());
             return;
         }
-        LOG.info("Processing payment response: [{},{}]", payment.getPaymentId(), response.getState());
+        LOG.info("Processing cashier payment response: [{},{}]", payment.getPaymentId(), response.getState().name());
         if (PaymentState.isFinished(response.getState().getCode())) {
             LocalDateTime now = LocalDateTime.now();
@@ -261,6 +264,7 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                 throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "关闭交易订单失败: 无效的订单状态");
             }
+            LOG.info("Requesting close cashier trade order: {}", tradeId);
             LocalDateTime now = LocalDateTime.now();
             // 获取所有支付记录
             List<OnlinePayment> onlinePayments = onlinePaymentDao.listOnlinePayments(trade.getTradeId(),
@@ -326,6 +330,7 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
             TradeType.TRADE.getCode(), PaymentState.SUCCESS.getCode()).stream().findFirst()
             .orElseThrow(() -> new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不能进行交易退款: 无支付信息"));
+        LOG.info("Requesting cashier payment refund: {}", request.getTradeId());
         LocalDateTime now = LocalDateTime.now().withNano(0);
         KeyGenerator refundIdKey = snowflakeKeyManager.getKeyGenerator(SnowflakeKey.PAYMENT_ID);
         String refundId = refundIdKey.nextId();
@@ -341,6 +346,7 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
             throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不支持的支付通道");
         }
+        LOG.debug("Cashier payment refund result: [{}:{}]", trade.getTradeId(), response.getState().name());
         OnlinePayment refund = OnlinePayment.builder().outMchId(payment.getOutMchId()).tradeId(payment.getTradeId())
             .type(TradeType.REFUND).paymentId(refundId).channelId(payment.getChannelId())
             .payType(payment.getPayType()).pipelineId(payment.getPipelineId()).goods(payment.getGoods() + "-退款")
@@ -356,8 +362,11 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
             tradeAssistantService.proceedTradeOrder(tradeState);
         } else if (!PaymentState.isFinished(response.getState().getCode())) {
             // 固定周期后，查询退款状态，根据状态完成退款订单
-            TaskMessage message = new TaskMessage(TaskMessage.TYPE_CASHIER_REFUND_SCAN, refundId, "1");
-            taskMessageSender.sendDelayTaskMessage(message, trade.getTimeout() * 1000);
+            if (pipeline instanceof OnlinePipeline<?> onlinePipeline) { // 只有在线支付通道允许查询退款状态
+                long delay = onlinePipeline.getTimeStrategy().nextRefundScanTime(1);
+                TaskMessage message = new TaskMessage(TaskMessage.TYPE_CASHIER_REFUND_SCAN, refundId, "1");
+                taskMessageSender.sendDelayTaskMessage(message, delay);
+            }
         }
         return new OnlineRefundResult(refundId, payment.getPaymentId(), response.getState().getCode(),
@@ -369,14 +378,14 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
     public void notifyRefundResult(OnlineRefundResponse response) {
         OnlinePayment refund = tradeAssistantService.findByRefundId(response.getRefundId());
         if (PaymentState.isFinished(refund.getState())) {
-            LOG.warn("Duplicate process online refund order[{}:{}]", response.getRefundId(), response.getState());
+            LOG.warn("Duplicate process cashier refund response: [{}:{}]", response.getRefundId(), response.getState().name());
             return;
         }
         if (!PaymentState.isFinished(response.getState().getCode())) {
-            LOG.warn("Ignore online refund order[{}:{}]", response.getRefundId(), response.getState());
+            LOG.warn("Ignore cashier refund response: [{}:{}]", response.getRefundId(), response.getState().name());
             return;
         }
-        LOG.info("Processing online refund order[{}:{}]", response.getRefundId(), response.getState());
+        LOG.info("Processing cashier refund response: [{}:{}]", response.getRefundId(), response.getState().name());
         LocalDateTime now = LocalDateTime.now();
         TradeOrder trade = tradeAssistantService.findByTradeId(refund.getTradeId());
@@ -65,7 +65,7 @@ public class TradeAssistantServiceImpl implements ITradeAssistantService {
         List<OnlinePayment> onlinePayments = onlinePaymentDao.listOnlinePayments(trade.getTradeId(), TradeType.TRADE.getCode(), null);
         for (OnlinePayment payment : onlinePayments) {
             if (!PaymentState.isFinished(payment.getState())) {
-                LOG.info("Trying to close payment order in process: {}", payment.getPaymentId());
+                LOG.debug("Trying to close payment order in process: {}", payment.getPaymentId());
                 PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.class);
                 if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
                     // 理论上只存在一条支付中的支付记录，否则后面的支付通道关闭失败时，会回滚前面支付记录的状态修改