From dec3e1d97f2e6a16afdc78f4345ed036d6bbfcfd Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Mon, 6 Jul 2026 18:39:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(lakala):=20=E5=87=AD=E8=AF=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0store=5Fid=E5=AD=97=E6=AE=B5(=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AE=9D=E6=94=B6=E5=8D=95=E4=B8=8A=E9=80=81)=20+=20=E5=90=AF?= =?UTF-8?q?=E7=94=A8channel-two=E5=AD=90=E5=BA=94=E7=94=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lakala/client/credential/LakalaSdkCredential.java | 4 ++++ .../lakala/service/isv/LakalaIsvConfigAssembler.java | 3 +++ .../common/config/properties/DaxpayChannelProperties.java | 2 +- daxpay-start/src/main/resources/application-dev.yml | 6 +++--- daxpay-start/src/main/resources/application-prod.yml | 6 +++--- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/client/credential/LakalaSdkCredential.java b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/client/credential/LakalaSdkCredential.java index 003f23041..69a32630e 100644 --- a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/client/credential/LakalaSdkCredential.java +++ b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/client/credential/LakalaSdkCredential.java @@ -21,6 +21,10 @@ public class LakalaSdkCredential { private String lakalaMchNo; /// 终端号(termNo) private String termNo; + /// 商户门店编号(store_id) + /// 拉卡拉 V3 接口要求"支付宝收单上送"(条件必填 C), 走 acc_busi_fields 通道 + /// TODO 门店对接后从门店配置读取下发, 当前暂写死 + private String storeId; /// 是否沙箱环境 private Boolean sandbox; } diff --git a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/isv/LakalaIsvConfigAssembler.java b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/isv/LakalaIsvConfigAssembler.java index feca0a140..091d5630d 100644 --- a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/isv/LakalaIsvConfigAssembler.java +++ b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/service/isv/LakalaIsvConfigAssembler.java @@ -72,6 +72,9 @@ public class LakalaIsvConfigAssembler { throw new BizInfoException(CommonErrorCode.VALIDATE_PARAMETERS_ERROR, "error.channel.lakala.termNoNotConfigured"); } credential.setTermNo(termNo); + // 商户门店编号(拉卡拉 V3 接口"支付宝收单上送", 条件必填 C) + // TODO 门店对接后从门店配置读取, 当前暂写死占位值 + credential.setStoreId("1"); return credential; } } diff --git a/daxpay-platform/daxpay-platform-common/common-config/src/main/java/cn/daxpay/open/platform/common/config/properties/DaxpayChannelProperties.java b/daxpay-platform/daxpay-platform-common/common-config/src/main/java/cn/daxpay/open/platform/common/config/properties/DaxpayChannelProperties.java index cbdb0bd90..56704d28f 100644 --- a/daxpay-platform/daxpay-platform-common/common-config/src/main/java/cn/daxpay/open/platform/common/config/properties/DaxpayChannelProperties.java +++ b/daxpay-platform/daxpay-platform-common/common-config/src/main/java/cn/daxpay/open/platform/common/config/properties/DaxpayChannelProperties.java @@ -16,7 +16,7 @@ public class DaxpayChannelProperties { /// 子应用1(支付宝/微信) private ChannelApp one = new ChannelApp(); - /// 子应用2(银联/拉卡拉) — 未来扩展 + /// 子应用2(其他支付通道) — channel-two 已搭建架子, 通道待对接 private ChannelApp two = new ChannelApp(); /// 子应用3(抖音/其他) — 未来扩展 diff --git a/daxpay-start/src/main/resources/application-dev.yml b/daxpay-start/src/main/resources/application-dev.yml index c7cf6dfa2..5b29d4faa 100644 --- a/daxpay-start/src/main/resources/application-dev.yml +++ b/daxpay-start/src/main/resources/application-dev.yml @@ -163,9 +163,9 @@ daxpay: # 子应用1: 支付宝 + 微信支付(已启用, 本机启动的 dax-pay-channel-one 服务) one: base-url: http://127.0.0.1:20100 - # 子应用2: 银联 + 拉卡拉(未来扩展, 暂未启用) - # two: - # base-url: http://127.0.0.1:20200 + # 子应用2: 其他支付通道(channel-two 已搭建架子, 通道待对接) + two: + base-url: http://127.0.0.1:20200 # 子应用3: 抖音 + 其他通道(未来扩展, 暂未启用) # three: # base-url: http://127.0.0.1:20300 \ No newline at end of file diff --git a/daxpay-start/src/main/resources/application-prod.yml b/daxpay-start/src/main/resources/application-prod.yml index 44e53d37d..ead452ef3 100644 --- a/daxpay-start/src/main/resources/application-prod.yml +++ b/daxpay-start/src/main/resources/application-prod.yml @@ -141,9 +141,9 @@ daxpay: # 子应用1: 支付宝 + 微信支付(已启用, Docker Compose 中 channel-one 容器) one: base-url: ${CHANNEL_ONE_BASE_URL:http://channel-one:20100} - # 子应用2: 银联 + 拉卡拉(未来扩展, 暂未启用) - # two: - # base-url: ${CHANNEL_TWO_BASE_URL:http://channel-two:20200} + # 子应用2: 其他支付通道(channel-two 已搭建架子, 通道待对接) + two: + base-url: ${CHANNEL_TWO_BASE_URL:http://channel-two:20200} # 子应用3: 抖音 + 其他通道(未来扩展, 暂未启用) # three: # base-url: ${CHANNEL_THREE_BASE_URL:http://channel-three:20300} \ No newline at end of file