From 659a03be27c298ce8faf1a447578eb9b423c91f7 Mon Sep 17 00:00:00 2001
From: DaxPay Dev <dev@daxpay.com>
Date: Tue, 23 Jun 2026 21:29:59 +0800
Subject: [PATCH] =?UTF-8?q?refactor(payment):=20=E5=B8=B8=E8=A7=84?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=9C=8D=E5=8A=A1=20PayService=20=E9=87=8D?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E4=B8=BA=20NormalPayService?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/service/{PayService.java => NormalPayService.java}  | 4 ++--
 .../open/payment/unipay/controller/UniTradeController.java  | 6 +++---
 .../merchant/service/route/runtime/PayRouteService.java     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/{PayService.java => NormalPayService.java} (98%)

diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PayService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/NormalPayService.java
similarity index 98%
rename from daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PayService.java
rename to daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/NormalPayService.java
index 155dba8bf..516bd7de4 100644
--- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/PayService.java
+++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/pay/service/NormalPayService.java
@@ -23,12 +23,12 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Objects;
 
-/// # 支付服务类
+/// # 常规支付服务类
 ///
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class PayService {
+public class NormalPayService {
 
     private final PayAssistService payAssistService;
     private final PayUniHandleService payUniHandleService;
diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/unipay/controller/UniTradeController.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/unipay/controller/UniTradeController.java
index 4cb3baedc..4a64fea12 100644
--- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/unipay/controller/UniTradeController.java
+++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/unipay/controller/UniTradeController.java
@@ -9,7 +9,7 @@ import cn.daxpay.open.payment.common.util.DaxRes;
 import cn.daxpay.open.payment.common.service.MerchantPermissionService;
 import cn.daxpay.open.payment.old.pay.anno.PaymentVerify;
 import cn.daxpay.open.payment.pay.service.PayCloseService;
-import cn.daxpay.open.payment.pay.service.PayService;
+import cn.daxpay.open.payment.pay.service.NormalPayService;
 import cn.daxpay.open.payment.unipay.param.trade.pay.PayCloseParam;
 import cn.daxpay.open.payment.unipay.param.trade.pay.PayParam;
 import cn.daxpay.open.payment.unipay.result.trade.pay.PayResult;
@@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/unipay")
 @RequiredArgsConstructor
 public class UniTradeController {
-    private final PayService payService;
+    private final NormalPayService normalPayService;
     private final PayCloseService payCloseService;
     private final MerchantPermissionService permConfigService;
 
@@ -42,7 +42,7 @@ public class UniTradeController {
             // 订单: 该商户没有此接口的权限
             throw new OperationFailException(CommonCode.FAIL_CODE, "error.payment.order.merchantNoApiPermission");
         }
-        return DaxRes.ok(payService.pay(payParam));
+        return DaxRes.ok(normalPayService.pay(payParam));
     }
 
     @Operation(summary = "关闭和撤销接口")
diff --git a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java
index 99555ee4c..994bf84dd 100644
--- a/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java
+++ b/daxpay-payment/daxpay-payment-merchant/src/main/java/cn/daxpay/open/payment/merchant/service/route/runtime/PayRouteService.java
@@ -20,7 +20,7 @@ import org.springframework.stereotype.Service;
 
 /// # 支付通道路由服务
 ///
-/// 实现 PayRouteFacade，供 PayService 在支付流程中调用。
+/// 实现 PayRouteFacade，供 NormalPayService 在支付流程中调用。
 /// 已指定 product 则跳过；否则按 appId 加载策略，经基础/场景模式匹配后回填 product。
 /// 调用方需保证 appId 已解析完毕。
 @Slf4j