open-source/payment-spring-boot
1
0
Fork 0
mirror of https://github.com/dromara/payment-spring-boot.git synced 2026-03-14 05:43:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.0.11.SNAPSHOT' into 1.0.11.SNAPSHOT

Browse Source 
# Conflicts:
#	payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/SignatureProvider.java
This commit is contained in:
felord.cn
2021-05-16 23:45:27 +08:00
parent ed190cc875 9d01a0fa3a
commit 591eec7f65
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/SignatureProvider.java
View File

@@ -222,7 +222,7 @@ public class SignatureProvider {
} }
ArrayNode certificates = bodyObjectNode.withArray("data"); ArrayNode certificates = bodyObjectNode.withArray("data");
if (certificates.isArray() && certificates.size() > 0) { if (certificates.isArray() && certificates.size() > 0) {
CERTIFICATE_MAP.clear(); CERTIFICATE_MAP.remove(tenantId);
final CertificateFactory certificateFactory = CertificateFactory.getInstance("X509",BC_PROVIDER); final CertificateFactory certificateFactory = CertificateFactory.getInstance("X509",BC_PROVIDER);
certificates.forEach(objectNode -> { certificates.forEach(objectNode -> {
JsonNode encryptCertificate = objectNode.get("encrypt_certificate"); JsonNode encryptCertificate = objectNode.get("encrypt_certificate");

2
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/CompleteServiceOrderParams.java
View File

@@ -78,7 +78,7 @@ public class CompleteServiceOrderParams {
* false：不分账，默认：false * false：不分账，默认：false
* true：分账。 * true：分账。
*/ */
private Boolean profitSharing = Boolean.TRUE; private Boolean profitSharing = Boolean.FALSE;
/** /**
* 订单优惠标记，选填 * 订单优惠标记，选填
* <p> * <p>