docs: 现在可以通过API清单检索相关的API了

1.0.16

README.md

@@ -1,20 +1,59 @@
-# 最好用的微信支付V3 Spring Boot 组件 
+   <div align="center" style="margin-bottom: 10px"><h1>最全最好用的微信支付V3 Spring Boot 组件</h1></div>
 
-为了满足业务中出现app支付、公众号支付、小程序支付等多appid并存的场景，对原有的进行了增强开发出了多租户版本。
+<p align="center">
+    <a target="_blank" href="https://github.com/NotFound403/payment-spring-boot/blob/release/LICENSE">
+     	<img alt="" src="https://img.shields.io/github/license/NotFound403/payment-spring-boot"/>
+    </a>
+    <a target="_blank" href="https://felord.cn">
+     	<img alt="" src="https://img.shields.io/badge/java-8-red"/>
+    </a>   
+    <a target="_blank" href="https://spring.io">
+     	<img alt="" src="https://img.shields.io/badge/spring%20boot-2.4%2B-brightgreen"/>
+    </a>   
+    <a target="_blank" href="https://mvnrepository.com/artifact/cn.felord/payment-spring-boot">
+     	<img alt="" src="https://img.shields.io/maven-central/v/cn.felord/payment-spring-boot.svg?style=flat-square"/>
+    </a>   
+    <a target="_blank" href="https://github.com/NotFound403/payment-spring-boot">
+     	<img alt="" src="https://img.shields.io/github/stars/NotFound403/payment-spring-boot?style=social"/>
+    </a>    
+    <a target="_blank" href="https://gitee.com/felord/payment-spring-boot/stargazers">
+     	<img alt="" src="https://gitee.com/felord/payment-spring-boot/badge/star.svg?theme=white"/>
+    </a>    
+    <a target="_blank" href="https://work.weixin.qq.com/kfid/kfc9d9d759f27f087e1">
+     	<img alt="点击立即微信咨询" src="https://img.shields.io/badge/%E7%82%B9%E5%87%BB-%E5%BE%AE%E4%BF%A1%E5%92%A8%E8%AF%A2-brightgreen"/>
+    </a>    
+    <a target="_blank" href="https://jq.qq.com/?_wv=1027&k=qRTKHWY0">
+     	<img alt="点击加入QQ交流群" src="https://img.shields.io/badge/QQ%E4%BA%A4%E6%B5%81%E7%BE%A4-945342113-ff69b4"/>
+    </a>
+</p>
 
-请给[Payment Spring Boot](https://github.com/NotFound403/payment-spring-boot) **Star**以鼓励，谢谢。
 
+<p align="center">如果你感觉这个项目不错，请点击右上角的Star以鼓励作者，谢谢。</p>
+
+## 简介
+
+Java微信支付V3支付Spring Boot
+Starter，支持微信优惠券，代金券、商家券、智慧商圈、商家转账到零钱、公众号支付、微信小程序支付、分账、支付分、商家券、合单支付、先享卡、电商收付通等全部微信支付功能API，同时满足多个服务商、多个商户开发需求。一键集成，屏蔽了复杂度，API友好，上手快，欢迎star。
 
 ## Maven 最新中央仓库坐标
 
 ```xml
+
 <dependency>
     <groupId>cn.felord</groupId>
     <artifactId>payment-spring-boot-starter</artifactId>
-    <version>1.0.14.RELEASE</version>
+    <version>1.0.17.RELEASE</version>
 </dependency>
 ```
 
+## JDK问题
+
+**推荐使用Open JDK**，原因参见[FBI Warning](https://github.com/NotFound403/payment-spring-boot/issues/5)
+
+## 文档地址
+
+- [payment-spring-boot GitHub文档](https://notfound403.github.io/payment-spring-boot)
+
 ## 目前已经实现所有服务商和直连商户接口
 
 - 实现微信支付多商户
@@ -27,46 +66,305 @@
 - 实现微信支付V3 商家券
 - 实现微信支付V3 批量转账到零钱
 
-更多参考[changelog](https://notfound403.github.io/payment-spring-boot/#/changelog)
+更新日志参考[changelog](https://notfound403.github.io/payment-spring-boot/#/changelog)
 
-## 核心API结构
+## API清单
+
+API结构如下：
 ![](https://asset.felord.cn/blog/20220613092244.png)
+具体分为**直连商户**和**服务商**两个体系，请详细阅读文档说明
 
-- `WechatPartnerProfitsharingApi`  微信支付服务商V3分账
+> 随着版本迭代功能会增加，可通过API注册表类`WechatPayV3Type`进行API接口检索。
-- `WechatPayCallback`  微信支付V3回调通知工具封装
-- `WechatAllocationApi` 微信支付V2分账（未来会移除）
-- `WechatMarketingFavorApi` 微信支付代金券V3
-- `WechatCombinePayApi` 微信支付合单支付V3
-- `WechatPayScoreApi` 微信支付分V3
-- `WechatPayRedpackApi` 微信支付V2现金红包
-- `WechatDiscountCardApi` 微信支付V3先享卡
-- `WechatProfitsharingApi` 微信支付直连商户V3分账
-- `WechatPartnerPayApi` 微信支付服务商模式V3普通支付
-- `WechatMarketingBusiFavorApi` 微信支付V3商家券
-- `WechatPayTransfersApi` 微信支付V2企业付款到零钱，目前不包括到银行卡
-- `WechatDirectPayApi` 微信支付直连模式V3普通支付
-- `WechatPayScoreParkingApi` 微信支付分V3停车服务
-- `WechatBatchTransferApi` 微信支付V3批量转账到零钱 
-- `WechatPartnerSpecialMchApi` 微信支付V3服务商商户进件 
-- `WechatMediaApi` 微信支付V3媒体上传 
-- `WechatEcommerceApi` 电商收付通 
-- `WechatSmartGuideApi` 服务商或者直连商户-经营能力-支付即服务 
-- `WechatGoldPlanApi` 服务商-经营能力-点金计划
 
-> 随着版本迭代功能会增加。
+## 使用入门
+
+### 集成配置
+
+关于集成配置请详细阅读[payment-spring-boot GitHub文档](https://notfound403.github.io/payment-spring-boot)
+中[快速接入](https://notfound403.github.io/payment-spring-boot/#/quick_start)章节
+
+### 调用示例
+
+#### 开启支付
+
+需要手动通过`@EnableMobilePay`注解开启支付
+
+```java
+import cn.felord.payment.autoconfigure.EnableMobilePay;
+import org.springframework.context.annotation.Configuration;
+
+@EnableMobilePay
+@Configuration
+public class PayConfig {
+}
+```
+
+#### 支付接口调用
+
+这里简单以小程序支付为例，写了一个Spring MVC 控制器，在实践中建议对`WechatApiProvider`进行二次封装作服务层调用
+
+```java 
+import cn.felord.payment.wechat.enumeration.TradeBillType;
+import cn.felord.payment.wechat.v3.WechatApiProvider;
+import cn.felord.payment.wechat.v3.WechatDirectPayApi;
+import cn.felord.payment.wechat.v3.model.*;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
+import org.springframework.core.io.Resource;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+import java.time.Month;
+
+/**
+ * 支付接口开发样例，以小程序支付为例.
+ */
+@Profile({"wechat", "dev"})
+@RestController
+@RequestMapping("/marketing")
+public class PayController {
+    @Autowired
+    private WechatApiProvider wechatApiProvider;
+    String TENANT_ID = "mobile";
+
+    /**
+     * 总流程建议为 生成商品订单 -> 生成对应的支付订单 -> 支付操作 -> 支付结果回调更新 -> 结束
+     * <p>
+     * 此处建议在商品订单生成之后调用
+     *
+     * @param orderId 商品订单id
+     * @return the object node
+     */
+    @PostMapping("/js")
+    public ObjectNode js(@RequestParam String orderId) {
+
+        //TODO
+        // 查询该orderId下是否生成了支付订单
+        // 如果没有
+        // 新增支付订单存入数据库 并标明支付状态为【待支付】
+        // 根据新生成的支付订单信息向微信支付发起支付 并根据返回结果进行处理
+        // 如果有状态为待支付
+        // 根据待支付订单信息向微信支付发起支付 并根据返回结果进行处理
+        // 如果有状态为待支付之外的状态
+        // 根据产品的业务设计自行实现
+        // 支付状态更新逻辑在【回调接口 /wxpay/callbacks/transaction】中处理  需要幂等处理
+
+        // 开发时需要指定使用的商户租户配置 这里为 mobile 请参考 application-wechat.yml
+
+
+        PayParams payParams = new PayParams();
+
+        payParams.setDescription("felord.cn");
+        //
+        // 商户侧唯一订单号 建议为商户侧支付订单号 订单表主键 或者唯一标识字段
+        payParams.setOutTradeNo("X135423420201521613448");
+        // 需要定义回调通知
+        payParams.setNotifyUrl("/wxpay/callbacks/transaction");
+        Amount amount = new Amount();
+        amount.setTotal(100);
+        payParams.setAmount(amount);
+        // 此类支付  Payer 必传  且openid需要同appid有绑定关系 具体去看文档
+        Payer payer = new Payer();
+        payer.setOpenid("ooadI5kQYrrCqpgbisvC8bEw_oUc");
+        payParams.setPayer(payer);
+
+        return wechatApiProvider.directPayApi(TENANT_ID)
+                .jsPay(payParams)
+                .getBody();
+    }
+
+
+    /**
+     * 下载对账单 如果要解析内容的话自行实现
+     *
+     * @return the response entity
+     */
+    @GetMapping("/tradebill")
+    public ResponseEntity<Resource> download() {
+        WechatDirectPayApi wechatDirectPayApi = wechatApiProvider.directPayApi(TENANT_ID);
+
+        TradeBillParams tradeBillParams = new TradeBillParams();
+        tradeBillParams.setBillDate(LocalDate.of(2021, Month.MAY, 20));
+        tradeBillParams.setBillType(TradeBillType.ALL);
+        return wechatDirectPayApi.downloadTradeBill(tradeBillParams);
+    }
+
+    /**
+     * 下载申请资金账单  如果要解析内容的话自行实现
+     *
+     * @return the response entity
+     */
+    @GetMapping("/fundflowbill")
+    public ResponseEntity<Resource> fundFlowBill() {
+        WechatDirectPayApi wechatDirectPayApi = wechatApiProvider.directPayApi(TENANT_ID);
+
+        FundFlowBillParams fundFlowBillParams = new FundFlowBillParams();
+        fundFlowBillParams.setBillDate(LocalDate.of(2021, Month.MAY, 20));
+
+        return wechatDirectPayApi.downloadFundFlowBill(fundFlowBillParams);
+    }
+}
+```
+
+#### 回调示例
+
+回调可通过以下示例实现，多租户的回调可将租户ID`tenantId`作为路径参数来实现
+
+```java
+import cn.felord.payment.wechat.v3.WechatApiProvider;
+import cn.felord.payment.wechat.v3.WechatMarketingFavorApi;
+import cn.felord.payment.wechat.v3.WechatPayCallback;
+import cn.felord.payment.wechat.v3.model.ResponseSignVerifyParams;
+import lombok.SneakyThrows;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 注意为了演示该配置在使用微信配置application-wechat.yaml才生效
+ * <p>
+ * 务必保证回调接口的幂等性
+ * <p>
+ * 微信回调控制器，当支付成功、代金券核销成功后，微信支付服务器会通过回调进行通知商户侧。
+ * 商户侧可以根据微信的回调通知进行支付的后续处理，例如支付状态的变更等等。
+ * 需要注意的是回调接口需要白名单放行。
+ * <p>
+ * 开发者只需要编写对结果的{@link java.util.function.Consumer}即可。
+ * <p>
+ * 请注意：返回的格格式必须是{@link WechatPayCallback} 给出的格式，不能被包装和更改，切记！
+ * @author felord.cn
+ * @since 1.0.0.RELEASE
+ */
+@Profile({"wechat", "dev"})
+@RestController
+@RequestMapping("/wxpay/callbacks")
+public class CallbackController {
+    private static final String TENANT_ID = "mobile";
+    @Autowired
+    private WechatApiProvider wechatApiProvider;
+
+
+    /**
+     * 代金券核销通知.
+     * <p>
+     * 需要手动调用{@link WechatMarketingFavorApi#setMarketingFavorCallback(String)} 设置，一次性操作!
+     *
+     * @param wechatpaySerial    the wechatpay serial
+     * @param wechatpaySignature the wechatpay signature
+     * @param wechatpayTimestamp the wechatpay timestamp
+     * @param wechatpayNonce     the wechatpay nonce
+     * @param request            the request
+     * @return the map
+     */
+    @SneakyThrows
+    @PostMapping("/coupon")
+    public Map<String, ?> couponCallback(
+            @RequestHeader("Wechatpay-Serial") String wechatpaySerial,
+            @RequestHeader("Wechatpay-Signature") String wechatpaySignature,
+            @RequestHeader("Wechatpay-Timestamp") String wechatpayTimestamp,
+            @RequestHeader("Wechatpay-Nonce") String wechatpayNonce,
+            HttpServletRequest request) {
+        String body = request.getReader().lines().collect(Collectors.joining());
+        // 对请求头进行验签 以确保是微信服务器的调用
+        ResponseSignVerifyParams params = new ResponseSignVerifyParams();
+        params.setWechatpaySerial(wechatpaySerial);
+        params.setWechatpaySignature(wechatpaySignature);
+        params.setWechatpayTimestamp(wechatpayTimestamp);
+        params.setWechatpayNonce(wechatpayNonce);
+        params.setBody(body);
+        return wechatApiProvider.callback(TENANT_ID).couponCallback(params, data -> {
+            //TODO 对回调解析的结果进行消费  需要保证消费的幂等性 微信有可能多次调用此接口
+        });
+    }
+
+    /**
+     * 微信支付成功回调.
+     * <p>
+     * 无需开发者判断，只有扣款成功微信才会回调此接口
+     *
+     * @param wechatpaySerial    the wechatpay serial
+     * @param wechatpaySignature the wechatpay signature
+     * @param wechatpayTimestamp the wechatpay timestamp
+     * @param wechatpayNonce     the wechatpay nonce
+     * @param request            the request
+     * @return the map
+     */
+    @SneakyThrows
+    @PostMapping("/transaction")
+    public Map<String, ?> transactionCallback(
+            @RequestHeader("Wechatpay-Serial") String wechatpaySerial,
+            @RequestHeader("Wechatpay-Signature") String wechatpaySignature,
+            @RequestHeader("Wechatpay-Timestamp") String wechatpayTimestamp,
+            @RequestHeader("Wechatpay-Nonce") String wechatpayNonce,
+            HttpServletRequest request) {
+        String body = request.getReader().lines().collect(Collectors.joining());
+        // 对请求头进行验签 以确保是微信服务器的调用
+        ResponseSignVerifyParams params = new ResponseSignVerifyParams();
+        params.setWechatpaySerial(wechatpaySerial);
+        params.setWechatpaySignature(wechatpaySignature);
+        params.setWechatpayTimestamp(wechatpayTimestamp);
+        params.setWechatpayNonce(wechatpayNonce);
+        params.setBody(body);
+        return wechatApiProvider.callback(TENANT_ID).transactionCallback(params, data -> {
+            //TODO 对回调解析的结果进行消费  需要保证消费的幂等性 微信有可能多次调用此接口
+        });
+    }
+
+    /**
+     * 微信合单支付成功回调.
+     * <p>
+     * 无需开发者判断，只有扣款成功微信才会回调此接口
+     *
+     * @param wechatpaySerial    the wechatpay serial
+     * @param wechatpaySignature the wechatpay signature
+     * @param wechatpayTimestamp the wechatpay timestamp
+     * @param wechatpayNonce     the wechatpay nonce
+     * @param request            the request
+     * @return the map
+     */
+    @SneakyThrows
+    @PostMapping("/combine_transaction")
+    public Map<String, ?> combineTransactionCallback(
+            @RequestHeader("Wechatpay-Serial") String wechatpaySerial,
+            @RequestHeader("Wechatpay-Signature") String wechatpaySignature,
+            @RequestHeader("Wechatpay-Timestamp") String wechatpayTimestamp,
+            @RequestHeader("Wechatpay-Nonce") String wechatpayNonce,
+            HttpServletRequest request) {
+        String body = request.getReader().lines().collect(Collectors.joining());
+        // 对请求头进行验签 以确保是微信服务器的调用
+        ResponseSignVerifyParams params = new ResponseSignVerifyParams();
+        params.setWechatpaySerial(wechatpaySerial);
+        params.setWechatpaySignature(wechatpaySignature);
+        params.setWechatpayTimestamp(wechatpayTimestamp);
+        params.setWechatpayNonce(wechatpayNonce);
+        params.setBody(body);
+        return wechatApiProvider.callback(TENANT_ID).combineTransactionCallback(params, data -> {
+            //TODO 对回调解析的结果进行消费  需要保证消费的幂等性 微信有可能多次调用此接口
+        });
+    }
+}
+```
 
 ## 开源协议
+
 **Apache 2.0**
 
 ## 仓库地址
+
 - [GitHub](https://github.com/NotFound403/payment-spring-boot)
 - [Gitee](https://gitee.com/felord/payment-spring-boot)
 
-## 文档地址
-- [payment-spring-boot GitHub文档](https://notfound403.github.io/payment-spring-boot)
-- [payment-spring-boot Gitee文档](https://felord.gitee.io/payment-spring-boot)
- 
 ## QQ交流群
+
 为了交流解惑，新建QQ群，可通过扫码进入。
 
 ![QQ交流群](./docs/img/qqun.png)

apidocs/cn/felord/payment/wechat/v3/model/StocksQueryParams.html

@@ -1,3 +1,20 @@
+<!--
+  ~  Copyright 2019-2022 felord.cn
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~       https://www.apache.org/licenses/LICENSE-2.0
+  ~  Website:
+  ~       https://felord.cn
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!-- NewPage -->
 <html lang="zh">
@@ -137,7 +154,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../cn/felord/payment/wechat/v3/model/StocksQueryParams.html#createEndTime">createEndTime</a></span></code>
 <div class="block">选填
  
- 终止时间  最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ss.SSSXXX</code></div>
+ 终止时间  最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ssXXX</code></div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -145,7 +162,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../cn/felord/payment/wechat/v3/model/StocksQueryParams.html#createStartTime">createStartTime</a></span></code>
 <div class="block">选填
  
- 起始时间  最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ss.SSSXXX</code></div>
+ 起始时间  最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ssXXX</code></div>
 </td>
 </tr>
 <tr class="altColor">
@@ -252,7 +269,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/time/OffsetDateTime.html?is-external=true" title="java.time中的类或接口">OffsetDateTime</a> createStartTime</pre>
 <div class="block">选填
  <p>
- 起始时间  最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ss.SSSXXX</code></div>
+ 起始时间  最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ssXXX</code></div>
 </li>
 </ul>
 <a name="createEndTime">
@@ -264,7 +281,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/time/OffsetDateTime.html?is-external=true" title="java.time中的类或接口">OffsetDateTime</a> createEndTime</pre>
 <div class="block">选填
  <p>
- 终止时间  最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ss.SSSXXX</code></div>
+ 终止时间  最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ssXXX</code></div>
 </li>
 </ul>
 <a name="status">

apidocs/index-all.html

@@ -1,3 +1,20 @@
+<!--
+  ~  Copyright 2019-2022 felord.cn
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~       https://www.apache.org/licenses/LICENSE-2.0
+  ~  Website:
+  ~       https://felord.cn
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!-- NewPage -->
 <html lang="zh">
@@ -1780,7 +1797,7 @@
 <dd>
 <div class="block">选填
  
- 终止时间  最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ss.SSSXXX</code></div>
+ 终止时间  最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ssXXX</code></div>
 </dd>
 <dt><span class="memberNameLink"><a href="cn/felord/payment/wechat/v3/WechatPayScoreApi.html#createServiceOrder-cn.felord.payment.wechat.v3.model.payscore.UserServiceOrderParams-">createServiceOrder(UserServiceOrderParams)</a></span> - 类 中的方法cn.felord.payment.wechat.v3.<a href="cn/felord/payment/wechat/v3/WechatPayScoreApi.html" title="cn.felord.payment.wechat.v3中的类">WechatPayScoreApi</a></dt>
 <dd>
@@ -1796,7 +1813,7 @@
 <dd>
 <div class="block">选填
  
- 起始时间  最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ss.SSSXXX</code></div>
+ 起始时间  最终满足格式 <code>yyyy-MM-dd'T'HH:mm:ssXXX</code></div>
 </dd>
 <dt><span class="memberNameLink"><a href="cn/felord/payment/wechat/v3/WechatMarketingBusiFavorApi.html#createStock-cn.felord.payment.wechat.v3.model.busifavor.BusiFavorCreateParams-">createStock(BusiFavorCreateParams)</a></span> - 类 中的方法cn.felord.payment.wechat.v3.<a href="cn/felord/payment/wechat/v3/WechatMarketingBusiFavorApi.html" title="cn.felord.payment.wechat.v3中的类">WechatMarketingBusiFavorApi</a></dt>
 <dd>

docs/README.md

@@ -35,7 +35,7 @@
 <dependency>
     <groupId>cn.felord</groupId>
     <artifactId>payment-spring-boot-starter</artifactId>
-    <version>1.0.14.RELEASE</version>
+    <version>1.0.17.RELEASE</version>
 </dependency>
 ```
 ## 采用技术

docs/changelog.md

@@ -1,15 +1,35 @@
+## 1.0.16.RELEASE
+### 微信支付
+- feat: 直连商户-委托营销相关API实现
+- enhance:基础支付增加电子发票入口开放标识
+- enhance:商家转账到零钱-发起商家转账 增加转账场景ID
+- enhance: 增加抽象接口`WechatTenantService`负责从配置文件或者其它数据源检索租户配置信息，提供默认实现`InMemoryWechatTenantService`向下兼容 #88
+- refactor: 服务商商户进件请求不再需要银行证明材料信息`BankAccountInfo`，已标记为废弃，涉及特约商户进件和电商收付通
+- upgrade: bcprov-jdk15to18 1.67 升级到 1.69
+
+## 1.0.15.RELEASE
+### 微信支付
+- feat: 增加服务商退款API
+- feat: 微信服务商分账-连锁品牌分账 [#82](https://github.com/NotFound403/payment-spring-boot/issues/82)
+- fix: 多租户证书无法复用的问题，刷新时正确移除证书 [#77](https://github.com/NotFound403/payment-spring-boot/issues/77)
+- fix: 批量转账到零钱API入参NPE问题修复 [#85](https://github.com/NotFound403/payment-spring-boot/issues/85)
+- fix: 商家券-修改批次预算API请求方法应该为Patch [#79](https://github.com/NotFound403/payment-spring-boot/issues/79)
+- enhance: 部分时间格式优化，更好地兼容Java Time API
+- enhance: 微信代金券样式的背景颜色枚举更新 [#84](https://github.com/NotFound403/payment-spring-boot/issues/84)
+- upgrade: Spring Boot 版本升级到2.7.7
+
 ## 1.0.14.RELEASE
 ### 微信支付
 - fix: 批量转账到零钱查询BUG [#I5E2X7](https://gitee.com/felord/payment-spring-boot/issues/I5E2X7)
 - feat: 移除了被标记过期的API，包括基于微信支付V2版本的分账实现，使用相关接口的同学需要针对性的进行迁移
 - feat: 增加证书绝对路径实现
-  - 配置项增加`certAbsolutePath`字段用来定义证书的绝对路径，优先级高于`certPath`，当这两个路径都不配置时采用classpath路径`wechat/apiclient_cert.p12`
+  - 配置项增加`certAbsolutePath`字段用来定义证书的绝对路径，优先级高于`certPath`，当这两个路径都不配置时采用classpath路径`wechat/apiclient_cert.p12` [#73](https://github.com/NotFound403/payment-spring-boot/issues/73)
 #### 服务商
 - feat: 实现服务商商户进件-特约商户进件相关API
 - feat: 实现点金计划，适用于服务商
 - feat: 实现行业方案-电商收付通
 - feat: 实现行业方案-智慧商圈
-  feat: 实现其它能力-银行组件（服务商）
+- feat: 实现其它能力-银行组件（服务商）
 - enhance: 服务商分账新增下载账单接口
 - enhance: 新增服务商退款回调接口
 #### 通用能力

docs/quick_start.md

@@ -4,7 +4,7 @@
 <dependency>
     <groupId>cn.felord</groupId>
     <artifactId>payment-spring-boot-starter</artifactId>
-    <version>1.0.14.RELEASE</version>
+    <version>1.0.17.RELEASE</version>
 </dependency>
 ```
 > 基于 **Spring Boot 2.x** 

docs/wechat_v3_api.md

@@ -1,112 +1,227 @@
 ## 入口类
 
-`WechatApiProvider`是本项目微信支付的入口类，已被注入**Spring IoC**。它目前包含以下几个**API**（后续会增加）。
+`WechatApiProvider`是本项目微信支付的入口类，已被注入**Spring IoC**，由它来初始化微信支付相关的**API**，具体分为**直连商户
+**和**服务商**两个体系。
 
-### 代金券API
+> 以下清单请搭配微信支付文档使用。
 
-`WechatMarketingFavorApi`是微信支付营销工具-[代金券相关API](https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pages/convention.shtml)的封装。
+### 直连商户
 
-#### 创建代金券批次API
+#### 基础支付
 
-`WechatResponseEntity<ObjectNode> createStock(StocksCreateParams params)`
+- [x] `WechatDirectPayApi` 基础支付，通过`WechatApiProvider#directPayApi`初始化
+    - [x] `jsPay` APP下单
+    - [x] `appPay` JSAPI/小程序下单
+    - [x] `h5Pay` H5下单
+    - [x] `nativePay` Native下单
+    - [x] 查询订单
+        1. `queryTransactionById` 微信支付订单号查询
+        2. `queryTransactionByOutTradeNo` 商户订单号查询
+    - [x] `close` 关闭订单
+    - [x] `WechatPayCallback#transactionCallback` 支付通知，参见下面回调说明
+    - [x] `refund` 申请退款
+    - [x] `queryRefundInfo` 查询单笔退款
+    - [x] `WechatPayCallback#refundCallback` 退款结果通知，参见下面回调说明
+    - [x] `downloadTradeBill` 申请交易账单，直接下载为gzip或者txt文件
+    - [x] `downloadFundFlowBill` 申请资金账单，直接下载为gzip或者txt文件
+- [x] `WechatCombinePayApi` 合单支付，通过`WechatApiProvider#combinePayApi`初始化
+    - [x] `jsPay` 合单APP下单
+    - [x] `appPay` 合单JSAPI/小程序下单
+    - [x] `h5Pay` 合单H5下单
+    - [x] `nativePay` 合单Native下单
+    - [x] `queryTransactionByOutTradeNo` 查询订单，**合单支付目前只支持商户订单号查询**
+    - [x] `close` 合单关闭订单
+    - [x] `WechatPayCallback#combineTransactionCallback` 合单支付通知，参见下面回调说明
+    - [x] `refund` 合单申请退款
+    - [x] `queryRefundInfo` 合单查询单笔退款
+    - [x] `WechatPayCallback#refundCallback` 退款结果通知，参见下面回调说明
+    - [x] `downloadTradeBill` 申请交易账单，直接下载为gzip或者txt文件
+    - [x] `downloadFundFlowBill` 申请资金账单，直接下载为gzip或者txt文件
+- [ ] ~~付款码支付~~，暂时没有V3接口，可通过payment spring boot 提供的V2扩展功能自行实现。
 
-#### 激活代金券批次API
+#### 经营能力
 
- `WechatResponseEntity<ObjectNode> startStock(String stockId)`
+##### 微信支付分
 
-#### 发放代金券API
+- [x] `WechatPayScoreApi` 微信支付分，通过`WechatApiProvider#payScoreApi`初始化
+    - [x] 公共API
+        - [x] `createServiceOrder` 创建支付分订单
+        - [x] `queryServiceOrder` 查询支付分订单
+        - [x] `cancelServiceOrder` 取消支付分订单
+        - [x] `modifyServiceOrder` 修改订单金额
+        - [x] `completeServiceOrder` 完结支付分订单
+        - [x] `syncServiceOrder` 同步服务订单信息
+        - [x] `WechatPayCallback#payscoreUserOrderCallback` 支付成功回调通知，参见下面回调说明
+        - [x] `refund` 支付分申请退款
+        - [x] `queryRefundInfo` 支付分查询单笔退款
+        - [x] `WechatPayCallback#refundCallback` 支付分退款结果通知，参见下面回调说明
+    - [x] 免确认预授权模式
+        - [x] `permissions` 商户预授权
+        - [x] `queryPermissionsByAuthCode` 查询与用户授权记录（授权协议号）
+        - [x] `terminatePermissionsByAuthCode` 解除用户授权关系（授权协议号）
+        - [x] `queryPermissionsByOpenId` 查询与用户授权记录（openid）
+        - [x] `terminatePermissionsByOpenId` 解除用户授权关系（openid）
+        - [x] `WechatPayCallback#permissionCallback` 开启/解除授权服务回调通知，参见下面回调说明
+    - [x] 需确认模式
+        - [x] `WechatPayCallback#payscoreUserOrderCallback` 确认订单回调通知，参见下面回调说明
 
-`WechatResponseEntity<ObjectNode> sendStock(StocksSendParams params)`
+##### 支付即服务
 
-#### 暂停代金券批次API
+- [x] `WechatSmartGuideApi` 支付即服务，通过`WechatApiProvider#smartGuideApi`初始化
+    - [x] `register` 服务人员注册
+    - [x] `assign` 服务人员分配
+    - [x] `query` 服务人员查询
+    - [x] `modify` 服务人员信息更新
 
-`WechatResponseEntity<ObjectNode> pauseStock(String stockId)`
+#### 行业方案
 
-#### 重启代金券批次API
+##### 智慧商圈
 
-`WechatResponseEntity<ObjectNode> restartStock(String stockId)`
+- [x] `WechatBusinessCircleApi` 智慧商圈，通过`WechatApiProvider#businessCircleApi`初始化
+    - [ ] 商圈会员积分服务授权结果通知回调（未实现）
+    - [x] `WechatPayCallback#mallTransactionCallback` 商圈会员场内支付结果通知，参见下面回调说明
+    - [x] `apply` 商圈积分同步
+    - [x] `WechatPayCallback#mallRefundCallback` 商圈会员场内退款通知，参见下面回调说明
+    - [x] `queryAuthStatus` 商圈积分授权查询
+    - [ ] 商圈会员待积分状态查询（未实现）
+    - [ ] 商圈会员停车状态同步（未实现）
 
-#### 条件查询批次列表API
+##### 微信支付分停车服务
-通过此接口可查询多个批次的信息，包括批次的配置信息以及批次概况数据。
 
-`WechatResponseEntity<ObjectNode> queryStocksByMch(StocksQueryParams params)`
+- [x] `WechatPayScoreParkingApi` 微信支付分停车服务，通过`WechatApiProvider#payScoreParkingApi`初始化
+    - [x] `find` 查询车牌服务开通信息
+    - [x] `parking` 创建停车入场
+    - [x] `transactionsParking` 扣费受理
+    - [x] `queryTransactionByOutTradeNo` 查询订单
+    - [x] `WechatPayCallback#payscoreParkingCallback` 停车入场状态变更通知，参见下面回调说明
+    - [x] `WechatPayCallback#payscoreTransParkingCallback` 订单支付结果通知，参见下面回调说明
+    - [x] `refund` 申请退款
+    - [x] `queryRefundInfo` 查询单笔退款
+    - [x] `WechatPayCallback#refundCallback` 退款结果通知，参见下面回调说明
 
-#### 查询批次详情API
+#### 营销工具
 
-`WechatResponseEntity<ObjectNode> queryStockDetail(String stockId)`
+##### 代金券
 
-#### 查询代金券详情API
+- [x] `WechatMarketingFavorApi` 代金券，通过`WechatApiProvider#payScoreParkingApi`初始化
+    - [x] `createStock` 创建代金券批次
+    - [x] `startStock` 激活代金券批次
+    - [x] `sendStock` 发放代金券
+    - [x] `pauseStock` 暂停代金券批次
+    - [x] `restartStock` 重启代金券批次
+    - [x] `queryStocksByMch` 条件查询批次列表
+    - [x] `queryStockDetail` 查询批次详情
+    - [x] `queryCouponDetails` 查询代金券详情
+    - [x] `queryMerchantsByStockId` 查询代金券可用商户
+    - [x] `queryStockItems` 查询代金券可用单品
+    - [x] `queryUserCouponsByMchId` 根据商户号查用户的券
+    - [x] `downloadStockUseFlow` 下载批次核销明细
+    - [x] `downloadStockRefundFlow` 下载批次退款明细
+    - [x] `setMarketingFavorCallback` 设置消息通知地址
+    - [x] `WechatPayCallback#couponCallback` 核销事件回调通知，参见下面回调说明
+    - [x] `sendCouponsCard` 发放消费卡
 
-`WechatResponseEntity<ObjectNode> queryCouponDetails(CouponDetailsQueryParams params)`
+> `sendCouponsCard` 发放消费卡，功能仅向指定邀约商户开放，如有需要请联系微信支付运营经理。
 
-#### 查询代金券可用商户API
+##### 商家券
 
-`WechatResponseEntity<ObjectNode> queryMerchantsByStockId(StocksQueryParams params)`
+- [x] `WechatMarketingBusiFavorApi` 商家券，通过`WechatApiProvider#busiFavorApi`初始化
+    - [x] `createStock` 创建商家券券批次
+    - [x] `queryStockDetail` 查询商家券详情
+    - [x] `use` 核销用户券
+    - [x] `queryUserStocks` 根据过滤条件查询用户券
+    - [x] `queryUserCoupon` 查询用户单张券详情
+    - [x] `uploadCouponCodes` 上传预存code
+    - [x] `setCallbacks` 设置商家券事件通知地址
+    - [x] `getCallbacks` 查询商家券事件通知地址
+    - [x] `associate` 关联订单信息
+    - [x] `disassociate` 取消关联订单信息
+    - [x] `budget` 修改批次预算
+    - [x] `updateStock` 修改商家券基本信息
+    - [x] `refund` 申请退券
+    - [x] `deactivate` 使券失效
+    - [x] `payMakeup` 营销补差付款
+    - [x] `queryMakeup` 查询营销补差付款单详情
+    - [x] `payMakeup` 营销补差付款
+    - [x] `WechatPayCallback#busiFavorReceiveCallback` 领券事件回调通知，参见下面回调说明
 
-#### 查询代金券可用单品API
+##### 委托营销
 
-`WechatResponseEntity<ObjectNode> queryStockItems(StocksQueryParams params)`
+- [x] `WechatMarketingPartnershipApi` 委托营销，通过`WechatApiProvider#marketingshipApi`初始化
+    - [x] `build` 建立合作关系
+    - [x] `query` 查询合作关系列表
 
-#### 根据商户号查用户的券API
+##### 支付有礼
 
-`WechatResponseEntity<ObjectNode> queryUserCouponsByMchId(UserCouponsQueryParams params)`
+- [ ] 功能实现中……
 
-#### 下载批次核销明细API
+##### 图片上传（营销专用）
 
-`WechatResponseEntity<ObjectNode> downloadStockUseFlow(String stockId)`
+- [x] 参见 **其它能力**
 
-#### 下载批次退款明细API
+##### 现金红包（基于V2）
 
-`WechatResponseEntity<ObjectNode> downloadStockRefundFlow(String stockId)`
+- [x] `WechatPayRedpackApi` 现金红包，通过`WechatApiProvider#redpackApi`初始化
+    - [x] `sendRedpack` 发放随机红包
+    - [x] `sendRedpack` 发放裂变红包
+    - [x] `redpackInfo` 查询红包信息
 
-#### 营销图片上传API
+> 重要：**基于V2实现，因此需要在配置文件中配置v2支付对应的`appSecret`参数**
 
-`WechatResponseEntity<ObjectNode> marketingImageUpload(MultipartFile file)`
+#### 资金应用
 
-#### 代金券核销回调通知API
+##### 商家转账到零钱
 
-`WechatResponseEntity<ObjectNode> setMarketingFavorCallback(String notifyUrl)`
+- [x] `WechatBatchTransferApi` 商家转账到零钱，通过`WechatApiProvider#batchTransferApi`初始化
+    - [x] `batchTransfer` 发起批量转账
+    - [x] 查询转账批次单
+        1. `queryBatchByBatchId` 通过微信批次单号查询批次单
+        2. `queryBatchByOutBatchNo` 通过商家批次单号查询批次单
+    - [x] 查询转账明细单
+        1. `queryBatchDetailByWechat` 通过微信明细单号查询明细单
+        2. `queryBatchDetailByMch` 通过商家明细单号查询明细单
+    - [x] 申请转账电子回单
+        1. `receiptBill` 转账账单电子回单申请受理接口
+        2. `downloadBill` 查询转账账单电子回单接口，附带下载能力
+    - [x] 申请转账明细电子回单
+        1. `transferElectronic` 受理转账明细电子回单
+        2. `queryTransferElectronicResult` 查询转账账单电子回单接口
+    - [x] 申请转账电子回单
+        1. `` 转账账单电子回单申请受理接口
+        2. `` 查询转账账单电子回单接口
 
-### 普通支付-直连模式API
+##### 分账
 
-`WechatDirectPayApi`是微信基础支付工具-[普通支付-直连模式API](https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pages/transactions.shtml)的封装。
+- [x] `WechatProfitsharingApi` 分账，通过`WechatApiProvider#profitsharingApi`初始化
+    - [x] `profitsharingOrders` 请求分账
+    - [x] `queryProfitsharingOrder` 查询分账结果
+    - [x] `returnOrders` 请求分账回退
+    - [x] `queryReturnOrders` 查询分账回退结果
+    - [x] `unfreeze` 解冻剩余资金
+    - [x] `queryAmounts` 查询剩余待分金额
+    - [x] `addReceivers` 添加分账接收方
+    - [x] `deleteReceivers` 删除分账接收方
+    - [x] `downloadMerchantBills` 申请分账账单
 
-#### APP下单API
+#### 风险合规
 
-`WechatResponseEntity<ObjectNode> appPay(PayParams payParams)`
+##### 消费者投诉2.0
 
-#### JSAPI/小程序下单API
+- [ ] 功能实现中……
 
-`WechatResponseEntity<ObjectNode> jsPay(PayParams payParams)`
+#### 其它能力
 
-#### Native下单API
+##### 清关报关
 
-`WechatResponseEntity<ObjectNode> nativePay(PayParams payParams)`
+- [ ] 清关报关 暂时没有V3接口，可通过payment spring boot 提供的V2扩展功能自行实现。
 
-#### H5下单API
+##### 媒体上传
 
-`WechatResponseEntity<ObjectNode> h5Pay(PayParams payParams)`
+> 包含图片上传和视频上传
 
-#### 微信支付订单号查询API
+- [x] `WechatMediaApi` 媒体上传，通过`WechatApiProvider#mediaApi`初始化
+    - [x] `mediaImageUpload` 图片上传
+    - [x] `mediaVideoUpload` 视频上传
+    - [x] `marketingImageUpload` 营销图片上传
 
-`WechatResponseEntity<ObjectNode> queryTransactionById(TransactionQueryParams params)`
+> 通过营销**图片上传API**上传图片后可获得图片url地址。图片url可在微信支付营销相关的API使用，包括商家券、代金券、支付有礼等。
-
-#### 商户订单号查询API
-
-`WechatResponseEntity<ObjectNode> queryTransactionByOutTradeNo(TransactionQueryParams params)`
-
-#### 关单API
-
-`WechatResponseEntity<ObjectNode> close(String outTradeNo)`
-
-### 回调API
-
-所有需要回调处理的微信支付业务通过`WechatPayCallback`来进行处理。
-
-#### 微信支付代金券核销回调API
-
-`Map<String, ?> couponCallback(ResponseSignVerifyParams params, Consumer<CouponConsumeData> couponConsumeDataConsumer)`
-
-#### 微信支付普通支付回调API
-
-`Map<String, ?> transactionCallback(ResponseSignVerifyParams params, Consumer<TransactionConsumeData> couponConsumeDataConsumer)`

payment-spring-boot-autoconfigure/pom.xml

@@ -1,15 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~  Copyright 2019-2022 felord.cn
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~       https://www.apache.org/licenses/LICENSE-2.0
+  ~  Website:
+  ~       https://felord.cn
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>cn.felord</groupId>
         <artifactId>payment-spring-boot</artifactId>
-        <version>1.0.14.RELEASE</version>
+        <version>1.0.17.RELEASE</version>
     </parent>
 
     <artifactId>payment-spring-boot-autoconfigure</artifactId>
-    <version>1.0.14.RELEASE</version>
+    <version>1.0.17.RELEASE</version>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/PayException.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment;
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayConfiguration.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.alipay;
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/alipay/AliPayProperties.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.alipay;
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/autoconfigure/EnableMobilePay.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.autoconfigure;
 

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

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,12 +13,12 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.autoconfigure;
 
 import cn.felord.payment.alipay.AliPayConfiguration;
 import cn.felord.payment.wechat.WechatPayConfiguration;
+import cn.felord.payment.wechat.WechatTenantServiceConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
@@ -28,6 +27,6 @@ import org.springframework.context.annotation.Import;
  * @since 1.0.0.RELEASE
  */
 @Configuration
-@Import({WechatPayConfiguration.class, AliPayConfiguration.class})
+@Import({WechatPayConfiguration.class, WechatTenantServiceConfiguration.class, AliPayConfiguration.class})
 public class PayConfiguration {
 }

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/InMemoryWechatTenantService.java

@@ -0,0 +1,62 @@
+/*
+ *  Copyright 2019-2022 felord.cn
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *  Website:
+ *       https://felord.cn
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package cn.felord.payment.wechat;
+
+import cn.felord.payment.wechat.v3.KeyPairFactory;
+import cn.felord.payment.wechat.v3.WechatMetaBean;
+import lombok.AllArgsConstructor;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.Resource;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * 从配置文件中加载租户信息,默认实现,可被覆盖
+ *
+ * @author xiafang
+ * @since 2023/2/3 11:40
+ */
+@AllArgsConstructor
+public class InMemoryWechatTenantService implements WechatTenantService {
+    private final WechatPayProperties wechatPayProperties;
+
+    @Override
+    public Set<WechatMetaBean> loadTenants() {
+        Map<String, WechatPayProperties.V3> v3Map = wechatPayProperties.getV3();
+        KeyPairFactory keyPairFactory = new KeyPairFactory();
+        return v3Map.entrySet()
+                .stream()
+                .map(entry -> {
+                    WechatPayProperties.V3 v3 = entry.getValue();
+                    String tenantId = entry.getKey();
+                    String certPath = v3.getCertPath();
+                    String certAbsolutePath = v3.getCertAbsolutePath();
+                    String mchId = v3.getMchId();
+                    Resource resource = certAbsolutePath != null ? new FileSystemResource(certAbsolutePath) :
+                            new ClassPathResource(certPath == null ? "wechat/apiclient_cert.p12" : certPath);
+                    WechatMetaBean wechatMetaBean = keyPairFactory.initWechatMetaBean(resource, mchId);
+                    wechatMetaBean.setV3(v3);
+                    wechatMetaBean.setTenantId(tenantId);
+                    return wechatMetaBean;
+                })
+                .collect(Collectors.toSet());
+    }
+}

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,22 +13,17 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat;
 
 
-import cn.felord.payment.wechat.v3.*;
+import cn.felord.payment.wechat.v3.SignatureProvider;
+import cn.felord.payment.wechat.v3.WechatApiProvider;
+import cn.felord.payment.wechat.v3.WechatMetaContainer;
+import cn.felord.payment.wechat.v3.WechatPayClient;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.Resource;
-
-import java.util.Map;
 
 /**
  * The type Wechat pay configuration.
@@ -38,39 +32,19 @@ import java.util.Map;
  * @since 1.0.0.RELEASE
  */
 @Configuration(proxyBeanMethods = false)
-@Conditional(WechatPayConfiguredCondition.class)
-@EnableConfigurationProperties(WechatPayProperties.class)
 public class WechatPayConfiguration {
-    /**
-     * The constant CERT_ALIAS.
-     */
-    private static final String CERT_ALIAS = "Tenpay Certificate";
 
     /**
      * 微信支付公私钥 以及序列号等元数据.
      *
-     * @param wechatPayProperties the wechat pay properties
+     * @param wechatTenantService the wechat tenant service
      * @return the wechat cert bean
      */
     @Bean
     @ConditionalOnMissingBean
-    WechatMetaContainer wechatMetaContainer(WechatPayProperties wechatPayProperties) {
+    WechatMetaContainer wechatMetaContainer(WechatTenantService wechatTenantService) {
-
-        Map<String, WechatPayProperties.V3> v3Map = wechatPayProperties.getV3();
         WechatMetaContainer container = new WechatMetaContainer();
-        KeyPairFactory keyPairFactory = new KeyPairFactory();
+              container.addWechatMetas(wechatTenantService.loadTenants());
-        v3Map.keySet().forEach(tenantId -> {
-            WechatPayProperties.V3 v3 = v3Map.get(tenantId);
-            String certPath = v3.getCertPath();
-            String certAbsolutePath = v3.getCertAbsolutePath();
-            String mchId = v3.getMchId();
-            Resource resource = certAbsolutePath != null ? new FileSystemResource(certAbsolutePath) :
-                    new ClassPathResource(certPath == null ? "wechat/apiclient_cert.p12" : certPath);
-            WechatMetaBean wechatMetaBean = keyPairFactory.initWechatMetaBean(resource, CERT_ALIAS, mchId);
-            wechatMetaBean.setV3(v3);
-            wechatMetaBean.setTenantId(tenantId);
-            container.addWechatMeta(tenantId, wechatMetaBean);
-        });
         return container;
     }
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguredCondition.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat;
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat;
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayResponseErrorHandler.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat;
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatTenantService.java

@@ -15,17 +15,19 @@
  *  limitations under the License.
  */
 
-package cn.felord.payment.wechat.v3.model.specmch;
+package cn.felord.payment.wechat;
 
-import java.util.List;
+import cn.felord.payment.wechat.v3.WechatMetaBean;
+
+import java.util.Set;
 
 /**
+ * 加载租户信息服务
+ *
  * @author felord.cn
- * @since 1.0.14.RELEASE
+ * @since 1.0.16.RELEASE
  */
-public class AdditionInfo {
+@FunctionalInterface
-    private String legalPersonCommitment;
+public interface WechatTenantService {
-    private String legalPersonVideo;
+    Set<WechatMetaBean> loadTenants();
-    private List<String> businessAdditionPics;
-    private String 	businessAdditionMsg;
 }

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatTenantServiceConfiguration.java

@@ -0,0 +1,48 @@
+/*
+ *  Copyright 2019-2022 felord.cn
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *  Website:
+ *       https://felord.cn
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package cn.felord.payment.wechat;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * The type Wechat tenant service configuration.
+ *
+ * @author felord.cn
+ * @since 1.0.16.RELEASE
+ */
+@Configuration(proxyBeanMethods = false)
+@Conditional(WechatPayConfiguredCondition.class)
+@EnableConfigurationProperties(WechatPayProperties.class)
+public class WechatTenantServiceConfiguration {
+
+    /**
+     * Wechat tenant service wechat tenant service.
+     *
+     * @param wechatPayProperties the wechat pay properties
+     * @return the wechat tenant service
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    public WechatTenantService wechatTenantService(WechatPayProperties wechatPayProperties) {
+        return new InMemoryWechatTenantService(wechatPayProperties);
+    }
+}

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/BankCode.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat.enumeration;
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/BusinessType.java

@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2019-2022 felord.cn
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *  Website:
+ *       https://felord.cn
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package cn.felord.payment.wechat.enumeration;
+
+/**
+ * The enum Business type.
+ *
+ * @author felord.cn
+ * @since 1.0.16.RELEASE
+ */
+public enum BusinessType {
+    /**
+     * 代金券批次（暂不支持合作方为商户的场景）
+     */
+    FAVOR_STOCK,
+    /**
+     * 商家券批次
+     */
+    BUSIFAVOR_STOCK
+}

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/ContactType.java

@@ -20,7 +20,7 @@ package cn.felord.payment.wechat.enumeration;
 /**
  * 超级管理员类型
  *
- * @since
+ * @since 1.0.14.RELEASE
  */
 public enum ContactType {
     /**
@@ -31,7 +31,7 @@ public enum ContactType {
     LEGAL,
     /**
      * 经办人
-     *
+     * <p>
      * 经商户授权办理微信支付业务的人员
      */
     SUPER

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/ContractStatus.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CountType.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponBgColor.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,42 +28,41 @@ public enum CouponBgColor {
     /**
      * Color 010 coupon bg color.
      */
-    Color010,
+    COLOR010,
     /**
-     * Color 020 coupon bg color.
+     * COLOR 020 coupon bg color.
      */
-    Color020,
+    COLOR020,
     /**
-     * Color 030 coupon bg color.
+     * COLOR 030 coupon bg color.
      */
-    Color030,
+    COLOR030,
     /**
-     * Color 040 coupon bg color.
+     * COLOR 040 coupon bg color.
      */
-    Color040,
+    COLOR040,
     /**
-     * Color 050 coupon bg color.
+     * COLOR 050 coupon bg color.
      */
-    Color050,
+    COLOR050,
     /**
-     * Color 060 coupon bg color.
+     * COLOR 060 coupon bg color.
      */
-    Color060,
+    COLOR060,
     /**
-     * Color 070 coupon bg color.
+     * COLOR 070 coupon bg color.
      */
-    Color070,
+    COLOR070,
     /**
-     * Color 080 coupon bg color.
+     * COLOR 080 coupon bg color.
      */
-    Color080,
+    COLOR080,
     /**
-     * Color 090 coupon bg color.
+     * COLOR 090 coupon bg color.
      */
-    Color090,
+    COLOR090,
     /**
-     * Color 100 coupon bg color.
+     * COLOR 100 coupon bg color.
      */
-    Color100
+    COLOR100
-
 }

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponStatus.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat.enumeration;
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/FundFlowAccountType.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/PartnerType.java

@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2019-2022 felord.cn
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *  Website:
+ *       https://felord.cn
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package cn.felord.payment.wechat.enumeration;
+
+/**
+ * The enum Partner type.
+ *
+ * @author felord.cn
+ * @since 1.0.16.RELEASE
+ */
+public enum PartnerType {
+    /**
+     * 合作方为APPID
+     */
+    APPID,
+    /**
+     * 合作方为商户
+     */
+    MERCHANT
+}

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/PartnershipState.java

@@ -0,0 +1,35 @@
+/*
+ *  Copyright 2019-2022 felord.cn
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *  Website:
+ *       https://felord.cn
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package cn.felord.payment.wechat.enumeration;
+
+/**
+ * 合作状态
+ *
+ * @author felord.cn
+ * @since 1.0.16.RELEASE
+ */
+public enum PartnershipState {
+    /**
+     * 已建立合作状态
+     */
+    ESTABLISHED,
+    /**
+     * 已终止合作状态
+     */
+    TERMINATED
+}

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/StockStatus.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat.enumeration;
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/StrategyType.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/SubjectType.java

@@ -31,6 +31,10 @@ public enum SubjectType {
      * 营业执照上的主体类型一般为个体户、个体工商户、个体经营；
      */
     SUBJECT_TYPE_INDIVIDUAL,
+    /**
+     * 小微商户
+     */
+    SUBJECT_TYPE_MICRO,
     /**
      * 企业
      * <p>

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TarType.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeBillType.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeState.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat.enumeration;
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeType.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat.enumeration;
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/UnfinishedReason.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WeChatServer.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat.enumeration;
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayAlgorithms.java

@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2019-2022 felord.cn
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *  Website:
+ *       https://felord.cn
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package cn.felord.payment.wechat.enumeration;
+
+import lombok.Getter;
+
+/**
+ * @author xiafang
+ * @since 2023/2/1 8:59
+ */
+@Getter
+public enum WechatPayAlgorithms {
+    RSA("WECHATPAY2-SHA256-RSA2048"),
+    SM3("WECHATPAY2-SM2-WITH-SM3");
+
+    private final String algorithm;
+
+    WechatPayAlgorithms(String algorithm) {
+        this.algorithm = algorithm;
+    }
+
+}

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat.enumeration;
 
@@ -460,11 +458,11 @@ public enum WechatPayV3Type {
      */
     MARKETING_BUSI_FAVOR_DISASSOCIATE(HttpMethod.POST, "%s/v3/marketing/busifavor/coupons/disassociate"),
     /**
-     * 取消关联订单信息API.
+     * 修改批次预算API.
      *
      * @since 1.0.4.RELEASES
      */
-    MARKETING_BUSI_FAVOR_BUDGET(HttpMethod.POST, "%s/v3/marketing/busifavor/stocks/{stock_id}/budget"),
+    MARKETING_BUSI_FAVOR_BUDGET(HttpMethod.PATCH, "%s/v3/marketing/busifavor/stocks/{stock_id}/budget"),
     /**
      * 修改商家券基本信息API.
      *
@@ -495,6 +493,20 @@ public enum WechatPayV3Type {
      * @since 1.0.13.RELEASES
      */
     MARKETING_BUSI_FAVOR_SUBSIDY_QUERY(HttpMethod.GET, "%s/v3/marketing/busifavor/subsidy/pay-receipts/{subsidy_receipt_id}"),
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    /**
+     * 建立合作关系API.
+     *
+     * @since 1.0.16.RELEASES
+     */
+    MARKETING_PARTNERSHIPS_BUILD(HttpMethod.POST, "%s/v3/marketing/partnerships/build"),
+    /**
+     * 查询合作关系列表API.
+     *
+     * @since 1.0.16.RELEASES
+     */
+    MARKETING_PARTNERSHIPS_GET(HttpMethod.GET, "%s/v3/marketing/partnerships"),
+
     //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     /**
      * 发起批量转账API.
@@ -680,6 +692,62 @@ public enum WechatPayV3Type {
      * @since 1.0.13.RELEASE
      */
     PROFITSHARING_BILLS(HttpMethod.GET, "%s/v3/profitsharing/bills"),
+
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    /**
+     * 请求品牌分账API.
+     *
+     * @since 1.0.15.RELEASE
+     */
+    BRAND_PROFITSHARING_ORDERS(HttpMethod.POST, "%s/v3/brand/profitsharing/orders"),
+    /**
+     * 查询品牌分账结果API.
+     *
+     * @since 1.0.15.RELEASE
+     */
+    BRAND_PROFITSHARING_RESULT(HttpMethod.GET, "%s/v3/brand/profitsharing/orders"),
+    /**
+     * 请求品牌分账回退API.
+     *
+     * @since 1.0.15.RELEASE
+     */
+    BRAND_PROFITSHARING_RETURN_ORDERS(HttpMethod.POST, "%s/v3/brand/profitsharing/returnorders"),
+    /**
+     * 查询品牌分账回退结果API.
+     *
+     * @since 1.0.15.RELEASE
+     */
+    BRAND_PROFITSHARING_RETURN_ORDERS_RESULT(HttpMethod.GET, "%s/v3/brand/profitsharing/returnorders"),
+    /**
+     * 完结品牌分账API.
+     *
+     * @since 1.0.15.RELEASE
+     */
+    BRAND_PROFITSHARING_FINISH_ORDER(HttpMethod.POST, "%s/v3/brand/profitsharing/finish-order"),
+    /**
+     * 查询订单剩余待分金额API.
+     *
+     * @since 1.0.15.RELEASE
+     */
+    BRAND_PROFITSHARING_ORDER_AMOUNTS(HttpMethod.GET, "%s/v3/brand/profitsharing/orders/{transaction_id}/amounts"),
+    /**
+     * 查询最大分账比例API.
+     *
+     * @since 1.0.15.RELEASE
+     */
+    BRAND_CONFIGS(HttpMethod.GET, "%s/v3/brand/profitsharing/brand-configs/{brand_mchid}"),
+    /**
+     * 添加品牌分账接收方API.
+     *
+     * @since 1.0.15.RELEASE
+     */
+    BRAND_PROFITSHARING_RECEIVERS_ADD(HttpMethod.POST, "%s/v3/brand/profitsharing/receivers/add"),
+    /**
+     * 删除分账接收方API.
+     *
+     * @since 1.0.15.RELEASE
+     */
+    BRAND_PROFITSHARING_RECEIVERS_DELETE(HttpMethod.POST, "%s/v3/brand/profitsharing/receivers/delete"),
     //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     /**
      * 服务商-商户进件-特约商户进件-提交申请单API.
@@ -830,7 +898,7 @@ public enum WechatPayV3Type {
      */
     ECOMMERCE_PROFITSHARING_RECEIVERS_ADD(HttpMethod.POST, "%s/v3/ecommerce/profitsharing/receivers/add"),
     /**
-     * 行业方案-电商收付通-分账-添加分账接收方API.
+     * 行业方案-电商收付通-分账-删除分账接收方API.
      *
      * @since 1.0.14.RELEASE
      */

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/AbstractApi.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat.v3;
 
@@ -94,8 +92,7 @@ public abstract class AbstractApi {
      * @param mapper the mapper
      */
     private void applyObjectMapper(ObjectMapper mapper) {
-        mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE
+        mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
-                )
                 .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
                 // empty string error
                 .configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true)

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/BranchBanksPageParams.java

@@ -1,3 +1,20 @@
+/*
+ *  Copyright 2019-2022 felord.cn
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *  Website:
+ *       https://felord.cn
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
 package cn.felord.payment.wechat.v3;
 
 import cn.felord.payment.wechat.v3.model.PageParams;

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/ExtensionFormHttpMessageConverter.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat.v3;
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/KeyPairFactory.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,17 +13,18 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat.v3;
 
 
 import cn.felord.payment.PayException;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 
-import java.security.*;
+import java.security.KeyPair;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
 import java.security.cert.X509Certificate;
 
 /**
@@ -34,17 +34,20 @@ import java.security.cert.X509Certificate;
  * @since 1.0.0.RELEASE
  */
 public class KeyPairFactory {
-
+    private static final String CERT_ALIAS = "Tenpay Certificate";
     private static final KeyStore PKCS12_KEY_STORE;
 
-       static {
+    static {
-           try {
+        try {
-               PKCS12_KEY_STORE = KeyStore.getInstance("PKCS12");
+            PKCS12_KEY_STORE = KeyStore.getInstance("PKCS12");
-           } catch (KeyStoreException e) {
+        } catch (KeyStoreException e) {
-             throw new PayException(" wechat pay keystore initialization failed");
+            throw new PayException(" wechat pay keystore initialization failed");
-           }
+        }
-       }
+    }
 
+    public WechatMetaBean initWechatMetaBean(Resource resource, String keyPass) {
+        return this.initWechatMetaBean(resource, CERT_ALIAS, keyPass);
+    }
 
     /**
      * 获取公私钥.

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

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat.v3;
 
@@ -58,12 +56,7 @@ import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.Arrays;
+import java.util.*;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -96,7 +89,7 @@ public class SignatureProvider {
     /**
      * 微信平台证书容器  key = 序列号  value = 证书对象
      */
-    private static final Map<String, X509WechatCertificateInfo> CERTIFICATE_MAP = new ConcurrentHashMap<>();
+    private static final Set<X509WechatCertificateInfo> CERTIFICATE_SET = Collections.synchronizedSet(new HashSet<>());
     /**
      * 加密算法提供方 - BouncyCastle
      */
@@ -186,14 +179,21 @@ public class SignatureProvider {
     public boolean responseSignVerify(ResponseSignVerifyParams params) {
 
         String wechatpaySerial = params.getWechatpaySerial();
-        if (CERTIFICATE_MAP.isEmpty() || !CERTIFICATE_MAP.containsKey(wechatpaySerial)) {
+        X509WechatCertificateInfo certificate = CERTIFICATE_SET.stream()
-            wechatMetaContainer.getTenantIds().forEach(this::refreshCertificate);
+                .filter(cert -> Objects.equals(wechatpaySerial, cert.getWechatPaySerial()))
-        }
+                .findAny()
-        Certificate certificate = CERTIFICATE_MAP.get(wechatpaySerial).getX509Certificate();
+                .orElseGet(() -> {
+                    wechatMetaContainer.getTenantIds().forEach(this::refreshCertificate);
+                    return CERTIFICATE_SET.stream()
+                            .filter(cert -> Objects.equals(wechatpaySerial, cert.getWechatPaySerial()))
+                            .findAny()
+                            .orElseThrow(() -> new PayException("cannot obtain the certificate"));
+                });
+
 
         final String signatureStr = createSign(params.getWechatpayTimestamp(), params.getWechatpayNonce(), params.getBody());
         Signature signer = Signature.getInstance("SHA256withRSA", BC_PROVIDER);
-        signer.initVerify(certificate);
+        signer.initVerify(certificate.getX509Certificate());
         signer.update(signatureStr.getBytes(StandardCharsets.UTF_8));
 
         return signer.verify(Base64Utils.decodeFromString(params.getWechatpaySignature()));
@@ -235,7 +235,11 @@ public class SignatureProvider {
         }
         ArrayNode certificates = bodyObjectNode.withArray("data");
         if (certificates.isArray() && certificates.size() > 0) {
-            CERTIFICATE_MAP.remove(tenantId);
+            CERTIFICATE_SET.forEach(x509WechatCertificateInfo -> {
+                if (Objects.equals(tenantId, x509WechatCertificateInfo.getTenantId())) {
+                    CERTIFICATE_SET.remove(x509WechatCertificateInfo);
+                }
+            });
             final CertificateFactory certificateFactory = CertificateFactory.getInstance("X509", BC_PROVIDER);
             certificates.forEach(objectNode -> {
                 JsonNode encryptCertificate = objectNode.get("encrypt_certificate");
@@ -253,7 +257,7 @@ public class SignatureProvider {
                     x509WechatCertificateInfo.setWechatPaySerial(responseSerialNo);
                     x509WechatCertificateInfo.setTenantId(tenantId);
                     x509WechatCertificateInfo.setX509Certificate((X509Certificate) certificate);
-                    CERTIFICATE_MAP.put(responseSerialNo, x509WechatCertificateInfo);
+                    CERTIFICATE_SET.add(x509WechatCertificateInfo);
                 } catch (CertificateException e) {
                     throw new PayException("An error occurred while generating the wechat v3 certificate, reason : " + e.getMessage());
                 }
@@ -296,7 +300,8 @@ public class SignatureProvider {
                 throw new PayException(e);
             }
             return new String(bytes, StandardCharsets.UTF_8);
-        } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | InvalidAlgorithmParameterException | NoSuchProviderException e) {
+        } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException |
+                 InvalidAlgorithmParameterException | NoSuchProviderException e) {
             throw new PayException(e);
         }
     }
@@ -336,10 +341,10 @@ public class SignatureProvider {
             WechatMetaBean wechatMetaBean = wechatMetaContainer.getWechatMeta(tenantId);
             PrivateKey privateKey = wechatMetaBean.getKeyPair().getPrivate();
             Cipher cipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-1AndMGF1Padding", BC_PROVIDER);
-            cipher.init(Cipher.DECRYPT_MODE,privateKey);
+            cipher.init(Cipher.DECRYPT_MODE, privateKey);
             byte[] data = Base64Utils.decodeFromString(message);
             byte[] cipherData = cipher.doFinal(data);
-            return new String(cipherData,StandardCharsets.UTF_8);
+            return new String(cipherData, StandardCharsets.UTF_8);
 
         } catch (Exception e) {
             throw new PayException(e);
@@ -353,22 +358,17 @@ public class SignatureProvider {
      * @return the x 509 wechat certificate info
      */
     public X509WechatCertificateInfo getCertificate(String tenantId) {
-        for (String serial : CERTIFICATE_MAP.keySet()) {
-            X509WechatCertificateInfo wechatCertificateInfo = CERTIFICATE_MAP.get(serial);
-            X509Certificate x509Cert = wechatCertificateInfo.getX509Certificate();
-            if (wechatCertificateInfo.getTenantId().equals(tenantId)){
-                try {
-                    x509Cert.checkValidity();
 
-                    return wechatCertificateInfo;
+        return CERTIFICATE_SET.stream()
-                } catch (Exception e) {
+                .filter(cert -> Objects.equals(tenantId, cert.getTenantId()))
-                    log.warn("the wechat certificate is invalid , {}", e.getMessage());
+                .findAny()
-                    // Async?
+                .orElseGet(() -> {
                     wechatMetaContainer.getTenantIds().forEach(this::refreshCertificate);
-                }
+                    return CERTIFICATE_SET.stream()
-            }
+                            .filter(cert -> Objects.equals(tenantId, cert.getTenantId()))
-        }
+                            .findAny()
-        throw new PayException("failed to obtain wechat pay x509Certificate ");
+                            .orElseThrow(() -> new PayException("cannot obtain the certificate"));
+                });
     }
 
 

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatApiProvider.java

@@ -1,5 +1,4 @@
 /*
- *
  *  Copyright 2019-2022 felord.cn
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +13,6 @@
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
- *
  */
 package cn.felord.payment.wechat.v3;
 
@@ -44,17 +42,6 @@ public class WechatApiProvider {
         this.wechatPayClient = wechatPayClient;
     }
 
-    /**
-     * 代金券.
-     *
-     * @param tenantId the tenant id
-     * @return the wechat marketing favor api
-     * @since 1.0.0.RELEASE
-     */
-    public WechatMarketingFavorApi favorApi(String tenantId) {
-        return new WechatMarketingFavorApi(this.wechatPayClient, tenantId);
-    }
-
     /**
      * 普通支付-直连模式.
      *
@@ -66,7 +53,6 @@ public class WechatApiProvider {
         return new WechatDirectPayApi(wechatPayClient, tenantId);
     }
 
-
     /**
      * 普通支付-服务商模式.
      *
@@ -122,6 +108,17 @@ public class WechatApiProvider {
         return new WechatDiscountCardApi(wechatPayClient, tenantId);
     }
 
+    /**
+     * 代金券.
+     *
+     * @param tenantId the tenant id
+     * @return the wechat marketing favor api
+     * @since 1.0.0.RELEASE
+     */
+    public WechatMarketingFavorApi favorApi(String tenantId) {
+        return new WechatMarketingFavorApi(this.wechatPayClient, tenantId);
+    }
+
     /**
      * 微信支付商家券.
      *
@@ -133,6 +130,16 @@ public class WechatApiProvider {
         return new WechatMarketingBusiFavorApi(wechatPayClient, tenantId);
     }
 
+    /**
+     * 委托营销-直连商户
+     *
+     * @param tenantId the tenant id
+     * @return the wechat marketing partnership api
+     */
+    public WechatMarketingPartnershipApi marketingshipApi(String tenantId) {
+        return new WechatMarketingPartnershipApi(this.wechatPayClient, tenantId);
+    }
+
     /**
      * 批量转账到零钱.
      * <p>
@@ -200,7 +207,7 @@ public class WechatApiProvider {
     }
 
     /**
-     * 服务商微信支付分账，基于V3
+     * 服务商-微信支付分账，基于V3
      *
      * @param tenantId the tenant id
      * @return the wechat partner profitsharing api
@@ -209,6 +216,16 @@ public class WechatApiProvider {
         return new WechatPartnerProfitsharingApi(wechatPayClient, tenantId);
     }
 
+    /**
+     * 服务商-品牌分账
+     *
+     * @param tenantId the tenant id
+     * @return the wechat brand profitsharing api
+     */
+    public WechatBrandProfitsharingApi brandProfitsharingApi(String tenantId) {
+        return new WechatBrandProfitsharingApi(wechatPayClient, tenantId);
+    }
+
     /**
      * 微信V3服务商-商户进件-特约商户进件
      *
@@ -254,7 +271,7 @@ public class WechatApiProvider {
     }
 
     /**
-     * 服务商智慧商圈
+     * 服务商-智慧商圈
      *
      * @param tenantId the tenant id
      * @return the wechat business circle api
@@ -265,7 +282,7 @@ public class WechatApiProvider {
     }
 
     /**
-     * 直连商户智慧商圈
+     * 直连商户-智慧商圈
      *
      * @param tenantId the tenant id
      * @return the wechat business circle api
@@ -297,4 +314,13 @@ public class WechatApiProvider {
         return new WechatCapitalApi(wechatPayClient, tenantId);
     }
 
+    /**
+     * 风险合规-消费者投诉2.0
+     *
+     * @param tenantId the tenant id
+     * @return the wechat complaints api
+     */
+    public WechatComplaintsApi complaintsApi(String tenantId) {
+        return new WechatComplaintsApi(wechatPayClient, tenantId);
+    }
 }

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatBatchTransferApi.java

@@ -82,7 +82,7 @@ public class WechatBatchTransferApi extends AbstractApi {
         List<CreateBatchTransferParams.TransferDetailListItem> encrypted = transferDetailList.stream()
                 .peek(transferDetailListItem -> {
                     String userName = transferDetailListItem.getUserName();
-                    if(StringUtils.hasText(userName)){
+                    if (StringUtils.hasText(userName)) {
                         String encryptedUserName = signatureProvider.encryptRequestMessage(userName, x509Certificate);
                         transferDetailListItem.setUserName(encryptedUserName);
                     }
@@ -103,7 +103,7 @@ public class WechatBatchTransferApi extends AbstractApi {
     }
 
     /**
-     * 微信批次单号查询批次单API
+     * 通过微信批次单号查询批次单API
      *
      * @param queryBatchTransferParams the queryBatchTransferParams
      * @return the wechat response entity
@@ -132,33 +132,7 @@ public class WechatBatchTransferApi extends AbstractApi {
     }
 
     /**
-     * 微信明细单号查询明细单API
+     * 通过商家批次单号查询批次单API
-     *
-     * @param queryBatchTransferDetailParams the queryBatchTransferDetailParams
-     * @return the wechat response entity
-     * @since 1.0.6.RELEASE
-     */
-    public WechatResponseEntity<ObjectNode> queryBatchDetailByWechat(QueryBatchTransferDetailParams queryBatchTransferDetailParams) {
-        WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
-        this.client().withType(WechatPayV3Type.BATCH_TRANSFER_DETAIL_WECHAT, queryBatchTransferDetailParams)
-                .function((type, params) -> {
-                    Map<String, String> pathParams = new HashMap<>(2);
-                    pathParams.put("batch_id", params.getBatchIdOrOutBatchNo());
-                    pathParams.put("detail_id", params.getDetailIdOrOutDetailNo());
-
-                    URI uri = UriComponentsBuilder.fromHttpUrl(type.uri(WeChatServer.CHINA))
-                            .build()
-                            .expand(pathParams)
-                            .toUri();
-                    return Get(uri);
-                })
-                .consumer(wechatResponseEntity::convert)
-                .request();
-        return wechatResponseEntity;
-    }
-
-    /**
-     * 微信批次单号查询批次单API
      *
      * @param queryBatchTransferParams the queryBatchTransferParams
      * @return the wechat response entity
@@ -187,7 +161,33 @@ public class WechatBatchTransferApi extends AbstractApi {
     }
 
     /**
-     * 商家明细单号查询明细单API
+     * 通过微信明细单号查询明细单API
+     *
+     * @param queryBatchTransferDetailParams the queryBatchTransferDetailParams
+     * @return the wechat response entity
+     * @since 1.0.6.RELEASE
+     */
+    public WechatResponseEntity<ObjectNode> queryBatchDetailByWechat(QueryBatchTransferDetailParams queryBatchTransferDetailParams) {
+        WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
+        this.client().withType(WechatPayV3Type.BATCH_TRANSFER_DETAIL_WECHAT, queryBatchTransferDetailParams)
+                .function((type, params) -> {
+                    Map<String, String> pathParams = new HashMap<>(2);
+                    pathParams.put("batch_id", params.getBatchIdOrOutBatchNo());
+                    pathParams.put("detail_id", params.getDetailIdOrOutDetailNo());
+
+                    URI uri = UriComponentsBuilder.fromHttpUrl(type.uri(WeChatServer.CHINA))
+                            .build()
+                            .expand(pathParams)
+                            .toUri();
+                    return Get(uri);
+                })
+                .consumer(wechatResponseEntity::convert)
+                .request();
+        return wechatResponseEntity;
+    }
+
+    /**
+     * 通过商家明细单号查询明细单API
      *
      * @param queryBatchTransferDetailParams the queryBatchTransferDetailParams
      * @return the wechat response entity
@@ -260,7 +260,7 @@ public class WechatBatchTransferApi extends AbstractApi {
     }
 
     /**
-     * 转账明细电子回单受理API
+     * 受理转账明细电子回单API
      * <p>
      * 受理转账明细电子回单接口，商户通过该接口可以申请受理转账明细单电子回单服务。
      * <p>

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatBrandProfitsharingApi.java

@@ -0,0 +1,327 @@
+/*
+ *  Copyright 2019-2022 felord.cn
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *  Website:
+ *       https://felord.cn
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package cn.felord.payment.wechat.v3;
+
+import cn.felord.payment.wechat.WechatPayProperties;
+import cn.felord.payment.wechat.enumeration.TarType;
+import cn.felord.payment.wechat.enumeration.WeChatServer;
+import cn.felord.payment.wechat.enumeration.WechatPayV3Type;
+import cn.felord.payment.wechat.v3.model.ecommerce.BrandReceiver;
+import cn.felord.payment.wechat.v3.model.ecommerce.BrandReceiverDeleteParams;
+import cn.felord.payment.wechat.v3.model.ecommerce.EcommerceFinishOrder;
+import cn.felord.payment.wechat.v3.model.ecommerce.EcommerceReturnOrderParams;
+import cn.felord.payment.wechat.v3.model.profitsharing.BrandProfitsharingOrder;
+import cn.felord.payment.wechat.v3.model.profitsharing.PartnerProfitsharingBillParams;
+import cn.felord.payment.wechat.v3.model.profitsharing.PartnerQueryOrderParams;
+import cn.felord.payment.wechat.v3.model.profitsharing.PartnerReturnOrdersParams;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.springframework.core.io.Resource;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Objects;
+
+/**
+ * 服务商-资金应用-连锁品牌分账
+ *
+ * @author felord.cn
+ * @since 1.0.15
+ */
+public class WechatBrandProfitsharingApi extends AbstractApi {
+
+    /**
+     * Instantiates a new Abstract api.
+     *
+     * @param wechatPayClient the wechat pay client
+     * @param tenantId        the tenant id
+     */
+    public WechatBrandProfitsharingApi(WechatPayClient wechatPayClient, String tenantId) {
+        super(wechatPayClient, tenantId);
+    }
+
+    /**
+     * 请求分账API
+     *
+     * @param brandProfitsharingOrder the brand profitsharing order
+     * @return the wechat response entity
+     */
+    public WechatResponseEntity<ObjectNode> profitsharingOrders(BrandProfitsharingOrder brandProfitsharingOrder) {
+        WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
+        this.client().withType(WechatPayV3Type.BRAND_PROFITSHARING_ORDERS, brandProfitsharingOrder)
+                .function((wechatPayV3Type, params) -> {
+                    params.setAppid(this.wechatMetaBean().getV3().getAppId());
+                    URI uri = UriComponentsBuilder.fromHttpUrl(wechatPayV3Type.uri(WeChatServer.CHINA))
+                            .build()
+                            .toUri();
+                    return Post(uri, params);
+                })
+                .consumer(wechatResponseEntity::convert)
+                .request();
+        return wechatResponseEntity;
+    }
+
+    /**
+     * 查询分账结果API
+     * <p>
+     * 发起分账请求后，可调用此接口查询分账结果
+     * <p>
+     * 注意：
+     * <ul>
+     *     <li>发起解冻剩余资金请求后，可调用此接口查询解冻剩余资金的结果</li>
+     * </ul>
+     *
+     * @param queryOrderParams the query order params
+     * @return the wechat response entity
+     */
+    public WechatResponseEntity<ObjectNode> queryProfitsharingOrder(PartnerQueryOrderParams queryOrderParams) {
+        WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
+        this.client().withType(WechatPayV3Type.BRAND_PROFITSHARING_RESULT, queryOrderParams)
+                .function((wechatPayV3Type, params) -> {
+                    MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>();
+                    queryParams.add("sub_mchid", params.getSubMchid());
+                    queryParams.add("transaction_id", params.getTransactionId());
+                    queryParams.add("out_order_no", params.getOutOrderNo());
+                    URI uri = UriComponentsBuilder.fromHttpUrl(wechatPayV3Type.uri(WeChatServer.CHINA))
+                            .queryParams(queryParams)
+                            .build()
+                            .toUri();
+                    return Get(uri);
+                })
+                .consumer(wechatResponseEntity::convert)
+                .request();
+        return wechatResponseEntity;
+    }
+
+    /**
+     * 请求分账回退API
+     * <p>
+     * 如果订单已经分账，在退款时，可以先调此接口，将已分账的资金从分账接收方的账户回退给分账方，再发起退款
+     *
+     * @param returnOrdersParams the return orders params
+     * @return the wechat response entity
+     */
+    public WechatResponseEntity<ObjectNode> returnOrders(PartnerReturnOrdersParams returnOrdersParams) {
+        WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
+        this.client().withType(WechatPayV3Type.BRAND_PROFITSHARING_RETURN_ORDERS, returnOrdersParams)
+                .function((wechatPayV3Type, params) -> {
+
+                    URI uri = UriComponentsBuilder.fromHttpUrl(wechatPayV3Type.uri(WeChatServer.CHINA))
+                            .build()
+                            .toUri();
+                    return Post(uri, params);
+                })
+                .consumer(wechatResponseEntity::convert)
+                .request();
+        return wechatResponseEntity;
+    }
+
+    /**
+     * 查询分账回退结果API
+     * <p>
+     * 商户需要核实回退结果，可调用此接口查询回退结果
+     * <p>
+     * 注意：
+     * <ul>
+     *     <li>如果分账回退接口返回状态为处理中，可调用此接口查询回退结果</li>
+     * </ul>
+     *
+     * @param queryReturnOrderParams the query return order params
+     * @return the wechat response entity
+     */
+    public WechatResponseEntity<ObjectNode> queryReturnOrders(EcommerceReturnOrderParams queryReturnOrderParams) {
+        WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
+        this.client().withType(WechatPayV3Type.BRAND_PROFITSHARING_RETURN_ORDERS_RESULT, queryReturnOrderParams)
+                .function((wechatPayV3Type, params) -> {
+                    MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>();
+                    queryParams.add("sub_mchid", params.getSubMchid());
+                    String orderId = params.getOrderId();
+                    if (orderId != null) {
+                        queryParams.add("order_id", orderId);
+                    }
+                    String outOrderNo = params.getOutOrderNo();
+                    if (outOrderNo != null) {
+                        queryParams.add("out_order_no", outOrderNo);
+                    }
+                    queryParams.add("out_return_no", params.getOutReturnNo());
+                    URI uri = UriComponentsBuilder.fromHttpUrl(wechatPayV3Type.uri(WeChatServer.CHINA))
+                            .queryParams(queryParams)
+                            .build()
+                            .toUri();
+                    return Get(uri);
+                })
+                .consumer(wechatResponseEntity::convert)
+                .request();
+        return wechatResponseEntity;
+    }
+
+    /**
+     * 完结分账API
+     * <p>
+     * 不需要进行分账的订单，可直接调用本接口将订单的金额全部解冻给二级商户。
+     *
+     * @param finishOrder the finish order
+     * @return the wechat response entity
+     */
+    public WechatResponseEntity<ObjectNode> finishOrder(EcommerceFinishOrder finishOrder) {
+        WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
+        this.client().withType(WechatPayV3Type.BRAND_PROFITSHARING_FINISH_ORDER, finishOrder)
+                .function((wechatPayV3Type, params) -> {
+                    URI uri = UriComponentsBuilder.fromHttpUrl(wechatPayV3Type.uri(WeChatServer.CHINA))
+                            .build()
+                            .toUri();
+                    return Post(uri, params);
+                })
+                .consumer(wechatResponseEntity::convert)
+                .request();
+        return wechatResponseEntity;
+    }
+
+    /**
+     * 查询订单剩余待分金额API
+     * <p>
+     * 可调用此接口查询订单剩余待分金额
+     *
+     * @param transactionId the transaction id
+     * @return the wechat response entity
+     */
+    public WechatResponseEntity<ObjectNode> queryOrderAmounts(String transactionId) {
+        WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
+        this.client().withType(WechatPayV3Type.BRAND_PROFITSHARING_ORDER_AMOUNTS, transactionId)
+                .function((wechatPayV3Type, id) -> {
+                    URI uri = UriComponentsBuilder.fromHttpUrl(wechatPayV3Type.uri(WeChatServer.CHINA))
+                            .build()
+                            .expand(id)
+                            .toUri();
+                    return Get(uri);
+                })
+                .consumer(wechatResponseEntity::convert)
+                .request();
+        return wechatResponseEntity;
+    }
+
+    /**
+     * 查询最大分账比例API
+     *
+     * @param brandMchid the brandMchid
+     * @return wechat response entity
+     */
+    public WechatResponseEntity<ObjectNode> brandConfigs(String brandMchid) {
+        WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
+        this.client().withType(WechatPayV3Type.BRAND_CONFIGS, brandMchid)
+                .function((wechatPayV3Type, id) -> {
+                    URI uri = UriComponentsBuilder.fromHttpUrl(wechatPayV3Type.uri(WeChatServer.CHINA))
+                            .build()
+                            .expand(id)
+                            .toUri();
+                    return Get(uri);
+                })
+                .consumer(wechatResponseEntity::convert)
+                .request();
+        return wechatResponseEntity;
+    }
+
+    /**
+     * 添加分账接收方API
+     * <p>
+     * 商户发起添加分账接收方请求，建立分账接收方列表。后续可通过发起分账请求，将分账方商户结算后的资金，分到该分账接收方
+     *
+     * @param brandReceiver the brandReceiver
+     * @return wechat response entity
+     */
+    public WechatResponseEntity<ObjectNode> addReceivers(BrandReceiver brandReceiver) {
+        WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
+        this.client().withType(WechatPayV3Type.BRAND_PROFITSHARING_RECEIVERS_ADD, brandReceiver)
+                .function((wechatPayV3Type, params) -> {
+                    WechatPayProperties.V3 v3 = this.wechatMetaBean().getV3();
+                    params.setAppid(v3.getAppId());
+                    URI uri = UriComponentsBuilder.fromHttpUrl(wechatPayV3Type.uri(WeChatServer.CHINA))
+                            .build()
+                            .toUri();
+                    return Post(uri, params);
+                })
+                .consumer(wechatResponseEntity::convert)
+                .request();
+        return wechatResponseEntity;
+    }
+
+    /**
+     * 删除分账接收方API
+     * <p>
+     * 商户发起删除分账接收方请求。删除后，不支持将分账方商户结算后的资金，分到该分账接收方
+     *
+     * @param delReceiversParams the del receivers params
+     * @return the wechat response entity
+     */
+    public WechatResponseEntity<ObjectNode> deleteReceivers(BrandReceiverDeleteParams delReceiversParams) {
+        WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
+        this.client().withType(WechatPayV3Type.BRAND_PROFITSHARING_RECEIVERS_DELETE, delReceiversParams)
+                .function((wechatPayV3Type, params) -> {
+                    WechatPayProperties.V3 v3 = this.wechatMetaBean().getV3();
+                    params.setAppid(v3.getAppId());
+                    URI uri = UriComponentsBuilder.fromHttpUrl(wechatPayV3Type.uri(WeChatServer.CHINA))
+                            .build()
+                            .toUri();
+                    return Post(uri, params);
+                })
+                .consumer(wechatResponseEntity::convert)
+                .request();
+        return wechatResponseEntity;
+    }
+
+    /**
+     * 申请分账账单API
+     *
+     * @param billParams the bill params
+     * @return the response entity
+     */
+    public ResponseEntity<Resource> downloadMerchantBills(PartnerProfitsharingBillParams billParams) {
+        WechatResponseEntity<ObjectNode> wechatResponseEntity = new WechatResponseEntity<>();
+        this.client().withType(WechatPayV3Type.PROFITSHARING_BILLS, billParams)
+                .function(((wechatPayV3Type, params) -> {
+                    MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>();
+                    String subMchid = params.getSubMchid();
+                    if (subMchid != null) {
+                        queryParams.add("sub_mchid", subMchid);
+                    }
+                    LocalDate billDate = params.getBillDate();
+                    queryParams.add("bill_date", billDate.format(DateTimeFormatter.ISO_DATE));
+                    TarType tarType = params.getTarType();
+                    if (Objects.nonNull(tarType)) {
+                        queryParams.add("tar_type", tarType.name());
+                    }
+
+                    URI uri = UriComponentsBuilder.fromHttpUrl(wechatPayV3Type.uri(WeChatServer.CHINA))
+                            .queryParams(queryParams)
+                            .build()
+                            .toUri();
+                    return Get(uri);
+                })).consumer(wechatResponseEntity::convert)
+                .request();
+        String downloadUrl = Objects.requireNonNull(wechatResponseEntity.getBody())
+                .get("download_url")
+                .asText();
+
+        String ext = Objects.equals(TarType.GZIP, billParams.getTarType()) ? ".gzip" : ".txt";
+        String filename = "profitsharingbill-" + billParams.getBillDate().toString() + ext;
+        return this.downloadBillResponse(downloadUrl, filename);
+    }
+}

payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatCapitalApi.java

@@ -1,3 +1,20 @@
+/*
+ *  Copyright 2019-2022 felord.cn
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *  Website:
+ *       https://felord.cn
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
 package cn.felord.payment.wechat.v3;
 
 import cn.felord.payment.wechat.enumeration.WeChatServer;