Merge pull request #58 from alipay/feature-241216

1. RDR拒付通知优化通用能力变更

Author: ScottWryyyyy

CHANGE.log

@@ -131,4 +131,7 @@ CKP二期支付结果查询和支付结果通知透出支付方式信息
 38、Version:2.0.46
 update --- notify_dispute 拒付通知增加争议类型
 39、Version:2.0.48
-update --- 优化base64多jdk版本兼容
+update --- 优化base64多jdk版本兼容
+40、Version:2.0.48
+1. RDR拒付通知优化通用能力变更
+2. Antom新增ApplePay支付方式

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.48</version>
+    <version>2.0.49</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.48</version>
+    <version>2.0.49</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/ApplePayConfiguration.java

@@ -0,0 +1,20 @@
+package com.alipay.global.api.model.ams;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Setter
+public class ApplePayConfiguration {
+    private List<String> requiredBillingContactFields;
+    private List<String> requiredShippingContactFields;
+    private Boolean buttonsBundled;
+    private String applePayToken;
+
+}

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

@@ -0,0 +1,5 @@
+package com.alipay.global.api.model.ams;
+
+public enum DisputeAcceptReasonType {
+    MERCHANT_ACCEPTED, TIMEOUT, MANUAL_PROCESSING_ACCEPTED
+}

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

@@ -1,5 +1,5 @@
 package com.alipay.global.api.model.ams;
 
 public enum DisputeNotificationType {
-    DISPUTE_CREATED,DISPUTE_JUDGED,DISPUTE_CANCELLED,DEFENSE_SUPPLIED,DEFENSE_DUE_ALERT,DISPUTE_ACCEPTED;
+    DISPUTE_CREATED, DISPUTE_JUDGED, DISPUTE_CANCELLED, DEFENSE_SUPPLIED, DEFENSE_DUE_ALERT, DISPUTE_ACCEPTED, RDR_RESOLVED;
 }

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

@@ -1,5 +1,5 @@
 package com.alipay.global.api.model.ams;
 
 public enum PaymentMethodType {
-    DISCOUNT, INTEREST_FREE, BALANCE_ACCOUNT, SETTLEMENT_CARD;
+    DISCOUNT, INTEREST_FREE, BALANCE_ACCOUNT, SETTLEMENT_CARD,APPLEPAY;
 }

src/main/java/com/alipay/global/api/request/ams/notify/AlipayDisputeNotify.java

@@ -1,6 +1,7 @@
 package com.alipay.global.api.request.ams.notify;
 
 import com.alipay.global.api.model.ams.Amount;
+import com.alipay.global.api.model.ams.DisputeAcceptReasonType;
 import com.alipay.global.api.model.ams.DisputeJudgedResult;
 import com.alipay.global.api.model.ams.DisputeNotificationType;
 import lombok.Data;
@@ -23,7 +24,8 @@ public class AlipayDisputeNotify extends AlipayNotify {
     private String disputeReasonCode;
     private String disputeSource;
     private String arn;
-    private String disputeAcceptReason;
+    private DisputeAcceptReasonType disputeAcceptReason;
     private String disputeAcceptTime;
     private String disputeType;
+    private Boolean defendable;
 }