diff --git a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatUserService.java b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatUserService.java index 648937c4d..b1e7a01a1 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatUserService.java +++ b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/auth/service/WechatUserService.java @@ -34,7 +34,7 @@ public class WechatUserService { public WechatUserInfoResult getUserInfo(String openId, String appId, String appSecret) { // 验证参数 if (StrUtil.isBlank(openId) || StrUtil.isBlank(appId) || StrUtil.isBlank(appSecret)) { - throw new OperationFailException(CommonCode.FAIL_CODE, "error.payment.channel.参数不能为空"); + throw new OperationFailException(CommonCode.FAIL_CODE, "error.channel.wechat.paramsRequired"); } try { @@ -45,7 +45,7 @@ public class WechatUserService { WxMpUser wxMpUser = wxMpService.getUserService().userInfo(openId); if (wxMpUser == null) { - throw new OperationFailException(CommonCode.FAIL_CODE, "error.payment.channel.获取用户信息失败"); + throw new OperationFailException(CommonCode.FAIL_CODE, "error.channel.wechat.userInfoNotFound"); } // 转换结果 @@ -68,7 +68,7 @@ public class WechatUserService { // 判断是否是用户未关注 if (e.getError().getErrorCode() == 49003) { - throw new OperationFailException(CommonCode.FAIL_CODE, "error.payment.channel.用户未关注公众号"); + throw new OperationFailException(CommonCode.FAIL_CODE, "error.channel.wechat.userNotSubscribed"); } // 微信: 获取用户信息失败: {0} @@ -100,7 +100,7 @@ public class WechatUserService { WxMaPhoneNumberInfo phoneInfo = wxMaService.getUserService().getPhoneNoInfo(code); if (phoneInfo == null) { - throw new OperationFailException(CommonCode.FAIL_CODE, "error.payment.channel.获取手机号失败"); + throw new OperationFailException(CommonCode.FAIL_CODE, "error.channel.wechat.phoneNotFound"); } // 转换结果 diff --git a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMaMessageService.java b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMaMessageService.java index effd19974..69b6bc636 100644 --- a/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMaMessageService.java +++ b/daxpay-platform/daxpay-platform-capability/capability-wechat/src/main/java/cn/daxpay/open/platform/capability/wechat/message/service/WechatMaMessageService.java @@ -151,7 +151,7 @@ public class WechatMaMessageService { private void validateConfig(String wxAppId, String appSecret) { if (StrUtil.isBlank(wxAppId) || StrUtil.isBlank(appSecret)) { log.error("微信配置参数为空,wxAppId: {}", wxAppId); - throw new OperationFailException(CommonCode.FAIL_CODE, "error.payment.channel.微信配置参数不能为空"); + throw new OperationFailException(CommonCode.FAIL_CODE, "error.channel.wechat.configParamsRequired"); } } diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/error/channel/wechat.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/error/channel/wechat.json index 4f1cda5e0..dd24d4092 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/error/channel/wechat.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/en-US/error/channel/wechat.json @@ -26,6 +26,9 @@ "paramsRequired": "Parameters are required", "phoneFetchFailed": "Failed to fetch phone number: {0}", "phoneFetchError": "Phone number fetch error: {0}", + "userInfoNotFound": "WeChat user info not found", + "userNotSubscribed": "User has not subscribed to the official account", + "phoneNotFound": "WeChat phone number not found", "mpAuthFailed": "WeChat official account authentication failed: {0}", "mpAuthConfigError": "WeChat official account auth configuration error: {0}", "maAuthFailed": "WeChat mini program authentication failed: {0}", diff --git a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/error/channel/wechat.json b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/error/channel/wechat.json index 91e636a87..6789ead3f 100644 --- a/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/error/channel/wechat.json +++ b/daxpay-platform/daxpay-platform-common/common-i18n/src/main/resources/i18n/zh-CN/error/channel/wechat.json @@ -26,6 +26,9 @@ "paramsRequired": "参数不能为空", "phoneFetchFailed": "获取手机号失败: {0}", "phoneFetchError": "获取手机号异常: {0}", + "userInfoNotFound": "未获取到微信用户信息", + "userNotSubscribed": "用户未关注公众号", + "phoneNotFound": "未获取到微信手机号", "mpAuthFailed": "微信公众号认证失败: {0}", "mpAuthConfigError": "微信公众号认证配置错误: {0}", "maAuthFailed": "微信小程序认证失败: {0}", diff --git a/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/exception/NonceMissingException.java b/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/exception/NonceMissingException.java index cecc125ac..a7652f80d 100644 --- a/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/exception/NonceMissingException.java +++ b/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/exception/NonceMissingException.java @@ -7,7 +7,7 @@ import static cn.daxpay.open.platform.core.code.CommonErrorCode.NONCE_MISSING; public class NonceMissingException extends BizInfoException { public NonceMissingException() { - super(NONCE_MISSING, "Nonce缺失"); + super(NONCE_MISSING, "error.common.nonceMissing"); initMessageKey("error.common.nonceMissing"); } diff --git a/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/exception/config/ConfigErrorException.java b/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/exception/config/ConfigErrorException.java index 7561dc779..228fef375 100644 --- a/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/exception/config/ConfigErrorException.java +++ b/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/exception/config/ConfigErrorException.java @@ -23,7 +23,7 @@ public class ConfigErrorException extends PayFailureException { public ConfigErrorException() { // 配置错误 - super(DaxPayErrorCode.CONFIG_ERROR,"配置错误"); + super(DaxPayErrorCode.CONFIG_ERROR,"pay.error.configError"); initMessageKey("pay.error.configError"); } } diff --git a/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/exception/operation/OperationFailException.java b/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/exception/operation/OperationFailException.java index 960a34aff..c6ed851e7 100644 --- a/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/exception/operation/OperationFailException.java +++ b/daxpay-platform/daxpay-platform-core/src/main/java/cn/daxpay/open/platform/core/exception/operation/OperationFailException.java @@ -22,7 +22,7 @@ public class OperationFailException extends PayFailureException { } public OperationFailException() { - super(DaxPayErrorCode.OPERATION_FAIL,"操作失败"); + super(DaxPayErrorCode.OPERATION_FAIL,"pay.error.operateFailed"); initMessageKey("pay.error.operateFailed"); } }