From 47378fb7743a8e139d0ee2de8f35eb41ba7bda06 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 25 Sep 2025 21:49:54 +0800
Subject: [PATCH] 汇旺财多账户支付配置
---
oying-system/src/main/java/com/oying/modules/hwc/service/impl/SwiftPassServiceImpl.java | 13 +++++++++++++
oying-system/src/main/java/com/oying/modules/security/config/SwiftPassProperties.java | 4 ++++
oying-system/src/main/resources/config/application-prod.yml | 8 ++++----
oying-system/src/main/java/com/oying/modules/hwc/utils/SignUtil.java | 4 ++++
4 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/hwc/service/impl/SwiftPassServiceImpl.java b/oying-system/src/main/java/com/oying/modules/hwc/service/impl/SwiftPassServiceImpl.java
index e0a7063..b0dfd84 100644
--- a/oying-system/src/main/java/com/oying/modules/hwc/service/impl/SwiftPassServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/hwc/service/impl/SwiftPassServiceImpl.java
@@ -72,6 +72,9 @@
case HWC2:
map.put("mch_id", properties.getMchId2());
break;
+ case HWC3:
+ map.put("mch_id", properties.getMchId3());
+ break;
default:
throw new BadRequestException("汇旺财类型错误");
}
@@ -140,6 +143,9 @@
break;
case HWC2:
map.put("mch_id", properties.getMchId2());
+ break;
+ case HWC3:
+ map.put("mch_id", properties.getMchId3());
break;
default:
throw new BadRequestException("汇旺财类型错误");
@@ -210,6 +216,9 @@
break;
case HWC2:
map.put("mch_id", properties.getMchId2());
+ break;
+ case HWC3:
+ map.put("mch_id", properties.getMchId3());
break;
default:
throw new BadRequestException("汇旺财类型错误");
@@ -286,6 +295,10 @@
map.put("mch_id", properties.getMchId2());
map.put("op_user_id", properties.getMchId2());
break;
+ case HWC3:
+ map.put("mch_id", properties.getMchId3());
+ map.put("op_user_id", properties.getMchId3());
+ break;
default:
throw new BadRequestException("汇旺财类型错误");
}
diff --git a/oying-system/src/main/java/com/oying/modules/hwc/utils/SignUtil.java b/oying-system/src/main/java/com/oying/modules/hwc/utils/SignUtil.java
index 6d9450a..5162317 100644
--- a/oying-system/src/main/java/com/oying/modules/hwc/utils/SignUtil.java
+++ b/oying-system/src/main/java/com/oying/modules/hwc/utils/SignUtil.java
@@ -32,6 +32,8 @@
return MD5.sign(preStr, "&key=" + properties.getKey(), "utf-8");
case HWC2:
return MD5.sign(preStr, "&key=" + properties.getKey2(), "utf-8");
+ case HWC3:
+ return MD5.sign(preStr, "&key=" + properties.getKey3(), "utf-8");
}
throw new BadRequestException("汇旺财类型错误");
}
@@ -54,6 +56,8 @@
return !SignUtils.checkParam(resultMap, properties.getKey());
case HWC2:
return !SignUtils.checkParam(resultMap, properties.getKey2());
+ case HWC3:
+ return !SignUtils.checkParam(resultMap, properties.getKey3());
}
throw new BadRequestException("汇旺财类型错误");
}
diff --git a/oying-system/src/main/java/com/oying/modules/security/config/SwiftPassProperties.java b/oying-system/src/main/java/com/oying/modules/security/config/SwiftPassProperties.java
index 14e156a..73f0549 100644
--- a/oying-system/src/main/java/com/oying/modules/security/config/SwiftPassProperties.java
+++ b/oying-system/src/main/java/com/oying/modules/security/config/SwiftPassProperties.java
@@ -19,6 +19,8 @@
private String key;
// 交易密钥2
private String key2;
+ // 交易密钥3
+ private String key3;
// 平台私钥
private String mchPrivateKey;
// 平台公钥
@@ -27,6 +29,8 @@
private String mchId;
// 门店编号2
private String mchId2;
+ // 门店编号3
+ private String mchId3;
// 签名方式
private String signType;
// 原生JS
diff --git a/oying-system/src/main/resources/config/application-prod.yml b/oying-system/src/main/resources/config/application-prod.yml
index 6a9f93d..6bfc2f9 100644
--- a/oying-system/src/main/resources/config/application-prod.yml
+++ b/oying-system/src/main/resources/config/application-prod.yml
@@ -164,17 +164,17 @@
# 汇旺财
swift-pass:
# 密钥
- key: s7Jf1eEM5QlxihWSxZh673pDhGY7p0s0
+ key-3: s7Jf1eEM5QlxihWSxZh673pDhGY7p0s0
# 密钥2
- key-2: s7Jf1eEM5QlxihWSxZh673pDhGY7p0s0
+ key-2: 0UNWjptc1diO2tVa2KASElS4qePosXKl
# 私钥
mch-private-key: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC2YNuGqSAFcIVOc9mnmIbnVfQoyyMBoyGqTD3beiy/UsXZrGF4OIrPEevwXnwHktURupjHAKvt92PL4L9wTz7cknaQkF0NH5saOdY3sL88xH7F3qSgIwHPvkRileFeEHx+pKnXBms8yiliDqPk0MV3iRRoXKhRnojrWAYJhyz+1iJ13qWXCWcpr9hf77Uu/r1N7wsJKN4Z75M2qQC6LgRTaHoBroLGVtld4PM30ee6o9RR8yiFVx4FDVukinGR15nTsrNh+sUx3piVXqYrq23UPjUWVtJlf9cEvfNVXCMsa71LGEzUl0zxDfeyXRQhel3E27p2oovEYvhl5s+pZhtXAgMBAAECggEBAKXZLKinccwgh8lRBrQmuz7x5ieWms3pWDryPCozTy/pCKyq2rQlzu0BIiqi8W09tG773eTSEodDOkhzqANsvQB+XD2YWlYN0NEnmUtpem67TYGItvI9A2+0WaHBJIGSwnO0MBKu7qQIP1vBbn8s7vWF/b3tzM70ORSzJkJR37QY435+ZG9rKMKyL/tuGW7E5AgrHmyl2aK9me3vgUrZct2e9l5XLrn9oU1niEmbDbFARhphXDCEPIvFiu7WtFDBmp/jEOc4u/y/sYMjS1RWpO9iOyTZDO8Mi9iofXugmoot4Tn0lBckeR6YVRb/I3EcVADoMfk1iaN1aWv1u+Ska8ECgYEA3ZFYMvo5y7SztrEbyLpWGsp6aM4a5ght8p52/rFhSHD5CGS7Uywhp4LxxIjLTRBNa/UkBzOq1Xt1+PVDNHf0E1yYZqEv9OXWC0yiCsnwO6b7o9hc3VnnX4jw7FkS0+pjfgCK4/A9hFj9xUI+qX3L3+pOCseioUeYofqTc2bn7ncCgYEA0rhvvNO30EisLACdOIem8XgbL4LjKJ47FnYS/TEZ9cDhJW5G2pAxgyFsqhN/GuTVg8uSQ7a6PlcBxzTuOwdZg05RcCAdmsXUdGjVbKk2i4CBp0K1j4QYfr8Wt18x0RLfzIQDrZQajWssVGjo8sfMn8qmjbRNbMmokRTflGIkEiECgYEAxChaYn9fzbYEaRixlWtKsdtSthjKfZ8239ZlWSVnEEBcaY7svTzT6r6mFq5Y9rgZIxvbsriOZQQxtKBGyFvubXnLvwizMWiNsGE/ELgphFZYcH0r8hgXHGBbk5NkdNMNFE+cpyJZBCPZP9tfKKUjavC/+RE3LPv66GS0SDXx3g8CgYAYOIT3cmqFcWUA5c0si0MgLEsLqgLMT2vBSC8klTlDqzj14XgZdUuLpBLmdbk9cSIttP+J8v3zXnLg3++mL1EVq7HmrnpYqPajrs0hYU3YuRuuCxfteCSMpRBKYZHLU10QF/iIQibPLIt65FgqV9boYxXD4f6oS4Gps3mDh8hXoQKBgBKojPBWgp4/WBMfh8nUzFzTiW7ACyG2jAxGtu0dtqfwx2LkesUKGhD1JGlxdDQ6jSv9tbhAgbZjTAULSo03626ZaiSDF+nCwFsobd3wRiij8LiL9amW5t6XBeX6bS5SCh45GbgnNBtzBqUI19/CGH09YXNpCYnADsY4fab4wNpR
# 公钥
plat-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmDbhqkgBXCFTnPZp5iG51X0KMsjAaMhqkw923osv1LF2axheDiKzxHr8F58B5LVEbqYxwCr7fdjy+C/cE8+3JJ2kJBdDR+bGjnWN7C/PMR+xd6koCMBz75EYpXhXhB8fqSp1wZrPMopYg6j5NDFd4kUaFyoUZ6I61gGCYcs/tYidd6llwlnKa/YX++1Lv69Te8LCSjeGe+TNqkAui4EU2h6Aa6CxlbZXeDzN9HnuqPUUfMohVceBQ1bpIpxkdeZ07KzYfrFMd6YlV6mK6tt1D41FlbSZX/XBL3zVVwjLGu9SxhM1JdM8Q33sl0UIXpdxNu6dqKLxGL4ZebPqWYbVwIDAQAB
# 门店编号
- mch-id: 1030238093
+ mch-id-3: 1030238093
# 门店编号2
- mch-id-2: 1030238093
+ mch-id-2: 1030240931
# 签名方式
sign-type: MD5
# 原生JS
--
Gitblit v1.9.3