Merge branch '1.0.11.SNAPSHOT' into release

dromara · Jun 5, 2021 · 554a93d · 554a93d
2 parents ee8d7d0 + c1d2cfc
commit 554a93d
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 6 deletions.
diff --git a/...-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatBatchTransferApi.java b/...-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatBatchTransferApi.java
@@ -288,7 +288,7 @@ public WechatResponseEntity<ObjectNode> transferElectronic(TransferDetailElectro
      * 查询转账明细电子回单受理结果接口，商户通过该接口可以查询电子回单受理进度信息，
      * 包括电子回单据信息，电子回单文件的hash值，电子回单文件的下载地址等。
      * <p>
-     * 返回的下载链接可调用{@link this#downloadBillResponse(String, String)}下载文件
+     * 返回的下载链接可调用{@link #downloadBillResponse(String, String)}下载文件
      *
      * @param params the params
      * @return the wechat response entity

diff --git a/...ring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/RefundParams.java b/...ring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/RefundParams.java
@@ -101,14 +101,12 @@ public static class RefundAmount {
      * 退款需要从指定账户出资时，传递此参数指定出资金额（币种的最小单位，只能为整数）。
      * <p>
      * 同时指定多个账户出资退款的使用场景需要满足以下条件：
-     * <p>
      * <ol>
      *  <li>未开通退款支出分离产品功能；</li>
      *  <li>订单属于分账订单，且分账处于待分账或分账中状态。</li>
      * </ol>
      * <p>
      * 参数传递需要满足条件：
-     * <p>
      * <ol>
      *   <li>基本账户可用余额出资金额与基本账户不可用余额出资金额之和等于退款金额；</li>
      *   <li>账户类型不能重复。</li>

diff --git a/.../java/cn/felord/payment/wechat/v3/model/batchtransfer/TransferDetailElectronicParams.java b/.../java/cn/felord/payment/wechat/v3/model/batchtransfer/TransferDetailElectronicParams.java
@@ -26,7 +26,6 @@ public class TransferDetailElectronicParams {
     private String outBatchNo;
     /**
      * 商家转账明细单号，必填。
-     * <p>
      * <ul>
      *     <li>受理类型为{@code BATCH_TRANSFER}时填写商家批量转账明细单号。</li>
      *     <li>受理类型为{@code TRANSFER_TO_POCKET}或{@code TRANSFER_TO_BANK}时填写商家转账单号。</li>

diff --git a/.../main/java/cn/felord/payment/wechat/v3/model/profitsharing/PartnerProfitSharingOrder.java b/.../main/java/cn/felord/payment/wechat/v3/model/profitsharing/PartnerProfitSharingOrder.java
@@ -45,7 +45,6 @@ public class PartnerProfitSharingOrder {
     private List<Receiver> receivers;
     /**
      * 是否解冻剩余未分资金，必填
-     * <p>
      * <ol>
      *     <li>如果为{@code true}，该笔订单剩余未分账的金额会解冻回分账方商户；</li>
      *     <li>如果为{@code false}，该笔订单剩余未分账的金额不会解冻回分账方商户，可以对该笔订单再次进行分账。</li>

diff --git a/...ure/src/main/java/cn/felord/payment/wechat/v3/model/profitsharing/ProfitSharingOrder.java b/...ure/src/main/java/cn/felord/payment/wechat/v3/model/profitsharing/ProfitSharingOrder.java
@@ -35,7 +35,6 @@ public class ProfitSharingOrder {
     private List<Receiver> receivers;
     /**
      * 是否解冻剩余未分资金，必填
-     * <p>
      * <ol>
      *     <li>如果为{@code true}，该笔订单剩余未分账的金额会解冻回分账方商户；</li>
      *     <li>如果为{@code false}，该笔订单剩余未分账的金额不会解冻回分账方商户，可以对该笔订单再次进行分账。</li>