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

配置导入

Browse Source
This commit is contained in:
xiafang
2023-02-09 09:26:00 +08:00
parent 55440b1275
commit 110b8b5cfc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/PayConfiguration.java
View File

@@ -18,6 +18,7 @@ package cn.felord.payment.autoconfigure;
import cn.felord.payment.alipay.AliPayConfiguration; import cn.felord.payment.alipay.AliPayConfiguration;
import cn.felord.payment.wechat.WechatPayConfiguration; import cn.felord.payment.wechat.WechatPayConfiguration;
import cn.felord.payment.wechat.WechatTenantServiceConfiguration;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
@@ -26,6 +27,6 @@ import org.springframework.context.annotation.Import;
* @since 1.0.0.RELEASE * @since 1.0.0.RELEASE
*/ */
@Configuration @Configuration
@Import({WechatPayConfiguration.class, AliPayConfiguration.class}) @Import({WechatPayConfiguration.class, WechatTenantServiceConfiguration.class, AliPayConfiguration.class})
public class PayConfiguration { public class PayConfiguration {
} }

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

@@ -1,5 +1,5 @@
/* /*
* Copyright 2019-2023 felord.cn * Copyright 2019-2022 felord.cn
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -93,7 +93,6 @@ public class WechatMarketingPartnershipApi extends AbstractApi {
.function((type, partnershipParams) -> { .function((type, partnershipParams) -> {
MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>(); MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>();
Partner partner = params.getPartner(); Partner partner = params.getPartner();
try { try {
ObjectMapper mapper = this.getMapper(); ObjectMapper mapper = this.getMapper();
if (Objects.nonNull(partner)) { if (Objects.nonNull(partner)) {