From eb3ce2f7b7d3e2dc29adbe1d71afc696c21355e2 Mon Sep 17 00:00:00 2001
From: DaxPay Dev <dev@daxpay.com>
Date: Wed, 1 Jul 2026 12:05:31 +0800
Subject: [PATCH] =?UTF-8?q?refactor(payment):=20=E8=BE=85=E5=8A=A9?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=89=AF=E4=BD=9C=E7=94=A8=E4=B8=89=E5=85=83?=
 =?UTF-8?q?=E6=94=B9=E7=94=A8=20if/else,=20Optional=20=E5=BC=95=E5=85=A5?=
 =?UTF-8?q?=E9=9D=99=E6=80=81=E5=AF=BC=E5=85=A5=E7=AE=80=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/assist/PaymentAssistService.java  | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/assist/PaymentAssistService.java b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/assist/PaymentAssistService.java
index c9735c872..d2774a5d8 100644
--- a/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/assist/PaymentAssistService.java
+++ b/daxpay-payment/daxpay-payment-common/src/main/java/cn/daxpay/open/payment/old/pay/service/assist/PaymentAssistService.java
@@ -23,6 +23,8 @@ import org.springframework.stereotype.Service;
 
 import java.util.Objects;
 
+import static java.util.Optional.*;
+
 
 /// # 交易支持服务接口
 ///
@@ -78,14 +80,17 @@ public class PaymentAssistService {
             mchNo = apiContext.getTradeInfo().getMchNo();
         }
         // 获取应用信息, 如果应用号不传输, 查询默认应用
-        var mchApp = StrUtil.isBlank(appId)
-                ? java.util.Optional.ofNullable(merchantPaymentQueryService.getDefaultAppByMchNo(mchNo))
+        cn.daxpay.open.payment.common.service.dto.MchAppInfoAccessInfo mchApp;
+        if (StrUtil.isBlank(appId)) {
+            mchApp = ofNullable(merchantPaymentQueryService.getDefaultAppByMchNo(mchNo))
                     // 未找到商户默认应用配置
-                    .orElseThrow(() -> new ConfigNotEnableException("error.payment.merchant.defaultAppConfigNotFound"))
-                : java.util.Optional.ofNullable(merchantPaymentQueryService.getAppByAppId(appId))
+                    .orElseThrow(() -> new ConfigNotEnableException("error.payment.merchant.defaultAppConfigNotFound"));
+        } else {
+            mchApp = ofNullable(merchantPaymentQueryService.getAppByAppId(appId))
                     // 未找到指定的应用配置
                     .orElseThrow(() -> new ConfigNotEnableException("error.payment.merchant.specifiedAppConfigNotFound"));
-        var merchant = java.util.Optional.ofNullable(merchantPaymentQueryService.getMerchantByMchNo(mchNo))
+        }
+        var merchant = ofNullable(merchantPaymentQueryService.getMerchantByMchNo(mchNo))
                 // 未找到指定的商户配置
                 .orElseThrow(() -> new ConfigNotEnableException("error.payment.merchant.specifiedMchConfigNotFound"));
         this.initData(merchant, mchApp);
@@ -99,7 +104,7 @@ public class PaymentAssistService {
     /// 5. 针对核心能力进行包装成功能时(收银台), 手动进行初始化
     public void initMchAndApp(String appId) {
         // 获取应用信息
-        var mchApp = java.util.Optional.ofNullable(merchantPaymentQueryService.getAppByAppId(appId))
+        var mchApp = ofNullable(merchantPaymentQueryService.getAppByAppId(appId))
                 // 未找到指定的应用配置
                 .orElseThrow(() -> new ConfigNotEnableException("error.payment.merchant.specifiedAppConfigNotFound"));
         // 商户端商户号读取系统, 不允许自行设置
@@ -109,7 +114,7 @@ public class PaymentAssistService {
                 throw new BizInfoException(CommonErrorCode.VALIDATE_PARAMETERS_ERROR, "pay.error.assist.mchNotOwnApp");
             }
         }
-        var merchant = java.util.Optional.ofNullable(merchantPaymentQueryService.getMerchantByMchNo(mchApp.getMchNo()))
+        var merchant = ofNullable(merchantPaymentQueryService.getMerchantByMchNo(mchApp.getMchNo()))
                 // 未找到指定的商户配置
                 .orElseThrow(() -> new ConfigNotEnableException("error.payment.merchant.specifiedMchConfigNotFound"));
         this.initData(merchant, mchApp);