From 68c6a5802964fc8f5b577feb39a44d733ddc9038 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期一, 14 九月 2026 13:30:42 +0800
Subject: [PATCH] refactor(payment): 退役平台自动提现，改由斗拱自动结算并新增结算记录页
---
talent-card-server/src/main/java/com/talentcard/server/business/payment/huifu/HuifuPaymentProperties.java | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/talent-card-server/src/main/java/com/talentcard/server/business/payment/huifu/HuifuPaymentProperties.java b/talent-card-server/src/main/java/com/talentcard/server/business/payment/huifu/HuifuPaymentProperties.java
index 5c474e5..4643736 100644
--- a/talent-card-server/src/main/java/com/talentcard/server/business/payment/huifu/HuifuPaymentProperties.java
+++ b/talent-card-server/src/main/java/com/talentcard/server/business/payment/huifu/HuifuPaymentProperties.java
@@ -14,8 +14,6 @@
private String privateKey = "";
private String platformPublicKey = "";
private String notifyUrl = "";
- private String withdrawalProductId = "";
- private String withdrawalNotifyUrl = "";
private String merchantBusinessNotifyUrl = "";
private String merchantOnboardingNotifyUrl = "";
private String merchantWechatConfigNotifyUrl = "";
@@ -25,8 +23,6 @@
private String merchantOnlineBusinessType = "H5311L";
private String merchantOnlineMediaName = "东区人才卡";
private String merchantAgreementUrl = "https://cloudpnrcdn.oss-cn-shanghai.aliyuncs.com/opps/api/prod/download_file/PaymentServiceAgreement.htm";
- private String withdrawalIntoAccountDateType = "DM";
- private boolean delayAccount;
private Boolean merchantCapabilityRequired;
public boolean isEnabled() { return enabled; }
@@ -47,18 +43,14 @@
public void setPlatformPublicKey(String platformPublicKey) { this.platformPublicKey = platformPublicKey; }
public String getNotifyUrl() { return notifyUrl; }
public void setNotifyUrl(String notifyUrl) { this.notifyUrl = notifyUrl; }
- public String getWithdrawalProductId() { return withdrawalProductId; }
- public void setWithdrawalProductId(String withdrawalProductId) { this.withdrawalProductId = withdrawalProductId; }
- public String getWithdrawalNotifyUrl() { return withdrawalNotifyUrl; }
- public void setWithdrawalNotifyUrl(String withdrawalNotifyUrl) { this.withdrawalNotifyUrl = withdrawalNotifyUrl; }
public String getMerchantBusinessNotifyUrl() {
if (merchantBusinessNotifyUrl != null && !merchantBusinessNotifyUrl.isBlank()) return merchantBusinessNotifyUrl;
- return withdrawalNotifyUrl == null ? "" : withdrawalNotifyUrl.replace("/withdrawal-notify", "/merchant-business-notify");
+ return callbackUrl("merchant-business-notify");
}
public void setMerchantBusinessNotifyUrl(String merchantBusinessNotifyUrl) { this.merchantBusinessNotifyUrl = merchantBusinessNotifyUrl; }
public String getMerchantOnboardingNotifyUrl() {
if (merchantOnboardingNotifyUrl != null && !merchantOnboardingNotifyUrl.isBlank()) return merchantOnboardingNotifyUrl;
- return withdrawalNotifyUrl == null ? "" : withdrawalNotifyUrl.replace("/withdrawal-notify", "/merchant-onboarding-notify");
+ return callbackUrl("merchant-onboarding-notify");
}
public void setMerchantOnboardingNotifyUrl(String merchantOnboardingNotifyUrl) { this.merchantOnboardingNotifyUrl = merchantOnboardingNotifyUrl; }
public String getMerchantWechatConfigNotifyUrl() {
@@ -84,19 +76,16 @@
public void setMerchantOnlineMediaName(String merchantOnlineMediaName) { this.merchantOnlineMediaName = merchantOnlineMediaName; }
public String getMerchantAgreementUrl() { return merchantAgreementUrl; }
public void setMerchantAgreementUrl(String merchantAgreementUrl) { this.merchantAgreementUrl = merchantAgreementUrl; }
- public String getWithdrawalIntoAccountDateType() { return withdrawalIntoAccountDateType; }
- public void setWithdrawalIntoAccountDateType(String withdrawalIntoAccountDateType) { this.withdrawalIntoAccountDateType = withdrawalIntoAccountDateType; }
- public boolean isDelayAccount() { return delayAccount; }
- public void setDelayAccount(boolean delayAccount) { this.delayAccount = delayAccount; }
/** Provider-side capability confirmation is on whenever the provider integration is enabled. */
public boolean isMerchantCapabilityRequired() {
return merchantCapabilityRequired != null ? merchantCapabilityRequired : enabled;
}
public void setMerchantCapabilityRequired(boolean merchantCapabilityRequired) { this.merchantCapabilityRequired = merchantCapabilityRequired; }
+ /** 由支付回调地址推导同一 host 与路径下的其它回调地址。 */
private String callbackUrl(String endpoint) {
- if (withdrawalNotifyUrl == null || withdrawalNotifyUrl.isBlank()) return "";
- int slash = withdrawalNotifyUrl.lastIndexOf('/');
- return slash < 0 ? "" : withdrawalNotifyUrl.substring(0, slash + 1) + endpoint;
+ if (notifyUrl == null || notifyUrl.isBlank()) return "";
+ int slash = notifyUrl.lastIndexOf('/');
+ return slash < 0 ? "" : notifyUrl.substring(0, slash + 1) + endpoint;
}
}
--
Gitblit v1.7.1