From b74b570a393ff32b4ed819fb94a6b7594337bbdb Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 13 Oct 2022 19:46:53 +0800 Subject: [PATCH] //ttpay --- .../db/migration/V2022101100001__add_pay_account.sql | 11 ++++++++++- .../src/main/java/com/iformall/utils/MaUtil.java | 7 ++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022101100001__add_pay_account.sql b/mallinkAdmin/src/main/resources/db/migration/V2022101100001__add_pay_account.sql index 1dd3d4d0f..427b4218b 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2022101100001__add_pay_account.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2022101100001__add_pay_account.sql @@ -4,4 +4,13 @@ ADD COLUMN `brandid` varchar(50) COMMENT '商圈品牌ID' AFTER `business_type`, ADD COLUMN `card_id` varchar(50) COMMENT '商圈会员卡ID' AFTER `brandid`; ALTER TABLE `mallink`.`wx_pay_account` -ADD COLUMN `merchant_cert_serial_no` varchar(100) AFTER `cert_serial_no`; \ No newline at end of file +ADD COLUMN `merchant_cert_serial_no` varchar(100) AFTER `cert_serial_no`; + + +update `mallink`.`wx_pay_account` set merchant_key_path = private_key_path,merchant_cert_serial_no = cert_serial_no,merchant_apiv3_key = api_v3_key +where type = 0; + +update `mallink`.`wx_pay_account` set private_key_path = null,cert_serial_no = null,api_v3_key = null +where type = 0; + +--清缓存,重启项目 \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/utils/MaUtil.java b/mallinkService/src/main/java/com/iformall/utils/MaUtil.java index 772d2db4f..6fce8d03a 100644 --- a/mallinkService/src/main/java/com/iformall/utils/MaUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/MaUtil.java @@ -150,12 +150,13 @@ public class MaUtil { } public TtPayService getTtPayService(WxAppinfo appinfo, WxPayAccount payAccount) { + //单商户模式 TtPayConfig config = new TtPayConfig(); config.setAppId(appinfo.getAppId()); - config.setPrivateKeyPath(payAccount.getPrivateKeyPath());//apiclient_key.pem 平台私钥 - config.setCertSerialNo(payAccount.getCertSerialNo());//平台私钥序列号 - config.setApiKey(payAccount.getApiV3Key());//平台私钥 + config.setPrivateKeyPath(payAccount.getMerchantKeyPath());//apiclient_key.pem 应用私钥证书 + config.setCertSerialNo(payAccount.getMerchantCertSerialNo());//证书序列号 + config.setApiKey(payAccount.getMerchantApiv3Key());//平台公钥 TtPayService service = ttpayServiceMap.get(appinfo.getAppId()); if ( null == service ) {