Merge branch 'master' into feature-250410

# Conflicts:
#	CHANGE.log
#	README.md
#	pom.xml
#	src/main/java/com/alipay/global/api/request/ams/pay/AlipayPaymentSessionRequest.java

Author: wangzunjiao

CHANGE.log

@@ -159,7 +159,13 @@ update --- 支付方式枚举类新增ABA
 1. 支付、查询、支付结果通知新增卡相关信息字段
 46、Version:2.0.55
 1. oneApi绑卡补全
+
 47、Version:2.0.56
+1. update notifyVaulting
+
+48、Version:2.0.57
+1. update add oneApi补全
+49、Version:2.0.58
 1. Antom 印度渠道接入AMS拒付相关接口的标准变更
 2. Antom印度渠道接入（UPI/CARD/NETBAKING）相关接口标准变更
 3. CKP二期支持商户传入支付方式地区和支付方式要素

README.md

@@ -12,7 +12,7 @@ https://mvnrepository.com/artifact/com.alipay.global.sdk/global-open-sdk-java
 <dependency>
     <groupId>com.alipay.global.sdk</groupId>
     <artifactId>global-open-sdk-java</artifactId>
-    <version>2.0.56</version>
+    <version>2.0.58</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.alipay.global.sdk</groupId>
     <artifactId>global-open-sdk-java</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.56</version>
+    <version>2.0.58</version>
     <name>global-open-sdk-java</name>
     <url>https://github.com/alipay/global-open-sdk-java</url>
     <description>

src/main/java/com/alipay/global/api/model/ams/InstallmentBank.java

@@ -0,0 +1,24 @@
+package com.alipay.global.api.model.ams;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InstallmentBank {
+    private Logo logo;
+    private String bankName;
+    private String bankShortName;
+    private String bankTerms;
+    private String bankPromoUrl;
+    private List<String> bins;
+    private List<Plan> plans;
+
+}

src/main/java/com/alipay/global/api/model/ams/PaymentMethodCategoryType.java

@@ -2,6 +2,6 @@
 
 public enum PaymentMethodCategoryType {
 
-    ALIPAY_PLUS, WALLET, MOBILE_BANKING_APP, BANK_TRANSFER, ONLINE_BANKING, CARD, OTC;
+    ALIPAY_PLUS, WALLET, MOBILE_BANKING_APP, BANK_TRANSFER, ONLINE_BANKING, CARD, OTC,BNPL;
 
 }

src/main/java/com/alipay/global/api/model/ams/PaymentMethodDetail.java

@@ -17,6 +17,12 @@ public class PaymentMethodDetail {
     private DiscountPaymentMethodDetail discount;
     private CouponPaymentMethodDetail coupon;
 
+    /**
+     * The type of payment method to be vaulted. Valid values are:
+     *
+     * CARD: the card used to be vaulted
+     * WALLET: the wallet used to be vaulted
+     */
     private String paymentMethodType;
     private String extendInfo;
 

src/main/java/com/alipay/global/api/model/ams/PaymentOption.java

@@ -31,4 +31,7 @@ public class PaymentOption {
     private Installment installment;
     private List<PromotionInfo> promotionInfos;
 
+    private InteractionType interactionType;
+    private String bankIdentifierCode;
+
 }

src/main/java/com/alipay/global/api/model/ams/RefundToBankInfo.java

@@ -0,0 +1,16 @@
+package com.alipay.global.api.model.ams;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RefundToBankInfo {
+    private String bankCode;
+    private UserName accountHolderName;
+    private String accountNo;
+}

src/main/java/com/alipay/global/api/model/ams/SubscriptionPlan.java

@@ -0,0 +1,20 @@
+package com.alipay.global.api.model.ams;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class SubscriptionPlan {
+
+    private Boolean allowAccumulate;
+    private Amount maxAccumulateAmount;
+    private PeriodRule periodRule;
+    private String subscriptionStartTime;
+    private String subscriptionNotificationUrl;
+
+}

src/main/java/com/alipay/global/api/model/ams/VaultingPaymentMethodDetail.java

@@ -12,5 +12,5 @@
 public class VaultingPaymentMethodDetail {
     private String paymentMethodType;
     private VaultingCard card;
-
+    private Wallet wallet;
 }