Merge pull request #21 from alipay/feature-241216

Feature 241216

Author: ScottWryyyyy

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.3.8 - 2024-12-16
+* [#20](https://github.com/alipay/global-open-sdk-python/pull/20)  feature-241216
+  - RDR拒付通知优化通用能力变更
+  - Antom新增ApplePay支付方式
+
 ## 1.3.7 - 2024-12-02
 * [#19](https://github.com/alipay/global-open-sdk-python/pull/19)  feature-241202
   - update AlipayDisputeNotify

README.md

@@ -1,7 +1,7 @@
 ```
 Language：Python  
 Python version：2.7+  
-Releass ^1.3.7
+Releass ^1.3.8
 Copyright：Ant financial services group  
 ```
 

com/alipay/ams/api/model/apple_pay_configuration.py

@@ -0,0 +1,56 @@
+import string
+
+
+class ApplePayConfiguration:
+    def __init__(self):
+        self.__required_billing_contact_fields = None #type: list[string]
+        self.__required_shipping_contact_fields = None #type: list[string]
+        self.__buttons_bundled = None #type: bool
+        self.__apple_pay_token = None #type: string
+
+
+    @property
+    def required_billing_contact_fields(self):
+        return self.__required_billing_contact_fields
+
+    @required_billing_contact_fields.setter
+    def required_billing_contact_fields(self, value):
+        self.__required_billing_contact_fields = value
+
+    @property
+    def required_shipping_contact_fields(self):
+        return self.__required_shipping_contact_fields
+
+    @required_shipping_contact_fields.setter
+    def required_shipping_contact_fields(self, value):
+        self.__required_shipping_contact_fields = value
+
+
+    @property
+    def buttons_bundled(self):
+        return self.__buttons_bundled
+
+    @buttons_bundled.setter
+    def buttons_bundled(self, value: bool):
+        self.__buttons_bundled = value
+
+    @property
+    def apple_pay_token(self):
+        return self.__apple_pay_token
+
+    @apple_pay_token.setter
+    def apple_pay_token(self, value: str):
+        self.__apple_pay_token = value
+
+    def to_ams_dict(self):
+        params = dict()
+        if hasattr(self, "required_billing_contact_fields") and self.required_billing_contact_fields:
+            params['referenceBuyerId'] = self.required_shipping_contact_fields
+        if hasattr(self, "required_shipping_contact_fields") and self.required_shipping_contact_fields:
+            params['referenceBuyerId'] = self.required_shipping_contact_fields
+        if hasattr(self, "buttons_bundled") and self.buttons_bundled:
+            params['referenceBuyerId'] = self.buttons_bundled
+        if hasattr(self, "apple_pay_token") and self.apple_pay_token:
+            params['referenceBuyerId'] = self.apple_pay_token
+        return params
+

com/alipay/ams/api/model/dispute_accept_reason_type.py

@@ -0,0 +1,11 @@
+from enum import Enum, unique
+
+
+@unique
+class DisputeAcceptReasonType(Enum):
+    MERCHANT_ACCEPTED = "MERCHANT_ACCEPTED"
+    TIMEOUT = "TIMEOUT"
+    MANUAL_PROCESSING_ACCEPTED = "MANUAL_PROCESSING_ACCEPTED"
+
+    def to_ams_dict(self):
+        return self.name

com/alipay/ams/api/model/dispute_judged_result.py

@@ -0,0 +1,10 @@
+from enum import Enum, unique
+
+
+@unique
+class DisputeNotificationType(Enum):
+    ACCEPT_BY_CUSTOMER = "ACCEPT_BY_CUSTOMER"
+    ACCEPT_BY_MERCHANT = "ACCEPT_BY_MERCHANT"
+
+    def to_ams_dict(self):
+        return self.name

com/alipay/ams/api/model/dispute_notification_type.py

@@ -0,0 +1,15 @@
+from enum import Enum, unique
+
+
+@unique
+class DisputeNotificationType(Enum):
+    DISPUTE_CREATED = "DISPUTE_CREATED"
+    DISPUTE_JUDGED = "DISPUTE_JUDGED"
+    DISPUTE_CANCELLED = "DISPUTE_CANCELLED"
+    DEFENSE_SUPPLIED = "DEFENSE_SUPPLIED"
+    DEFENSE_DUE_ALERT = "DEFENSE_DUE_ALERT"
+    DISPUTE_ACCEPTED = "DISPUTE_ACCEPTED"
+    RDR_RESOLVED = "RDR_RESOLVED"
+
+    def to_ams_dict(self):
+        return self.name

com/alipay/ams/api/model/payment_method_type.py

@@ -8,5 +8,6 @@ class PaymentMethodType(Enum):
     INTEREST_FREE = "INTEREST_FREE"
     BALANCE_ACCOUNT = "BALANCE_ACCOUNT"
     SETTLEMENT_CARD = "SETTLEMENT_CARD"
+    APPLEPAY = "APPLEPAY"
     def to_ams_dict(self):
         return self.name

com/alipay/ams/api/request/auth/alipay_auth_consult_request.py

@@ -110,7 +110,7 @@ def extend_info(self, value):
 
     @property
     def recurring_payment(self):
-        return self.recurring_payment
+        return self.__recurring_payment
 
     @recurring_payment.setter
     def recurring_payment(self, value):

com/alipay/ams/api/request/auth/alipay_auth_create_session_request.py

@@ -0,0 +1,84 @@
+import json
+
+from com.alipay.ams.api.model.agreement_info import AgreementInfo
+from com.alipay.ams.api.model.antom_path_constants import AntomPathConstants
+from com.alipay.ams.api.model.payment_method import PaymentMethod
+from com.alipay.ams.api.model.product_code_type import ProductCodeType
+from com.alipay.ams.api.model.scope_type import ScopeType
+from com.alipay.ams.api.request.alipay_request import AlipayRequest
+
+
+class AlipayAuthCreateSessionRequest(AlipayRequest):
+    def __init__(self):
+        super(AlipayAuthCreateSessionRequest, self).__init__(AntomPathConstants.CREATE_SESSION_PATH)
+        self.__product_code = None  # type:ProductCodeType
+        self.__agreement_info = None  # type:AgreementInfo
+        self.__scopes = None  # type:list[ScopeType]
+        self.__payment_method = None  # type:PaymentMethod
+        self.__payment_redirect_url = None
+
+    @property
+    def product_code(self):
+        return self.__product_code
+
+    @product_code.setter
+    def product_code(self, value: ProductCodeType):
+        self.__product_code = value
+
+    @property
+    def agreement_info(self):
+        return self.__agreement_info
+
+    @agreement_info.setter
+    def agreement_info(self, value: AgreementInfo):
+        self.__agreement_info = value
+
+    @property
+    def scopes(self):
+        return self.__scopes
+
+    @scopes.setter
+    def scopes(self, value: list[ScopeType]):
+        self.__scopes = value
+
+    @property
+    def payment_method(self):
+        return self.__payment_method
+
+    @payment_method.setter
+    def payment_method(self, value: PaymentMethod):
+        self.__payment_method = value
+
+    @property
+    def payment_redirect_url(self):
+        return self.__payment_redirect_url
+
+    @payment_redirect_url.setter
+    def payment_redirect_url(self, value: str):
+        self.__payment_redirect_url = value
+
+    def to_ams_json(self):
+        json_str = json.dumps(obj=self.__to_ams_dict(), default=lambda o: o.to_ams_dict(), indent=3)
+        return json_str
+
+    def __to_ams_dict(self):
+        params = dict()
+        if hasattr(self, "product_code") and self.product_code:
+            params['productCodeType'] = self.product_code
+
+        if hasattr(self, "agreement_info") and self.agreement_info:
+            params['agreementInfo'] = self.agreement_info.to_ams_json()
+
+        if hasattr(self, "scopes") and self.scopes:
+            scopes_list = []
+            for scope in self.scopes:
+                scopes_list.append(scope.value)
+            params['scopes'] = scopes_list
+
+        if hasattr(self, "payment_method") and self.payment_method:
+            params['paymentMethod'] = self.payment_method.to_ams_dict()
+
+        if hasattr(self, "payment_redirect_url") and self.payment_redirect_url:
+            params['paymentRedirectUrl'] = self.payment_redirect_url
+
+        return params