Merge pull request #24 from alipay/feature-241224

1. CKP二期支持商户传入可选支付方式列表

Author: ScottWryyyyy

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.4.0 - 2024-12-24
+* [#24](https://github.com/alipay/global-open-sdk-python/pull/24)  feature-241224
+  - CKP二期支持商户传入可选支付方式列表
+  - AMS独立绑卡支持MIT交易
+
 ## 1.3.9 - 2024-12-18
 * [#23](https://github.com/alipay/global-open-sdk-python/pull/23)  feature-update-version
   - update version

README.md

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

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

@@ -0,0 +1,31 @@
+from com.alipay.ams.api.model.payment_method_type_item import PaymentMethodTypeItem
+
+
+class AvailablePaymentMethod:
+
+    def __init__(self):
+        self.__payment_method_type_list = None #type: list[PaymentMethodTypeItem]
+
+
+    @property
+    def payment_method_type_list(self):
+        return self.__payment_method_type_list
+
+    @payment_method_type_list.setter
+    def payment_method_type_list(self, payment_method_type_list):
+        if not isinstance(payment_method_type_list, list):
+            raise TypeError("payment_method_type_list should be list[PaymentMethodTypeItem]")
+
+        for item in payment_method_type_list:
+            if not isinstance(item, PaymentMethodTypeItem):
+                raise TypeError("item should be type of PaymentMethodTypeItem")
+
+        self.__payment_method_type_list = payment_method_type_list
+
+
+    def to_ams_dict(self):
+        params = dict()
+        if self.__payment_method_type_list is not None:
+            params['paymentMethodTypeList'] = [item.to_ams_dict() for item in self.__payment_method_type_list]
+
+        return params

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

@@ -42,6 +42,7 @@ def __init__(self):
         self.__cpf = None
         self.__payer_email = None
         self.__network_transaction_id = None
+        self.__is_3DS_authentication = None
 
     @property
     def card_token(self):
@@ -279,6 +280,14 @@ def network_transaction_id(self):
     def network_transaction_id(self, value):
         self.__network_transaction_id = value
 
+    @property
+    def is_3DS_authentication(self):
+        return self.__is_3DS_authentication
+
+    @is_3DS_authentication.setter
+    def is_3DS_authentication(self, value):
+        self.__is_3DS_authentication = value
+
 
     def parse_rsp_body(self, card_payment_method_detail_body):
         if type(card_payment_method_detail_body) == str:
@@ -378,6 +387,8 @@ def parse_rsp_body(self, card_payment_method_detail_body):
             self.__payer_email = card_payment_method_detail_body['payerEmail']
         if 'networkTransactionId' in card_payment_method_detail_body:
             self.__network_transaction_id = card_payment_method_detail_body['networkTransactionId']
+        if 'is3DSAuthentication' in card_payment_method_detail_body:
+            self.__is_3DS_authentication = card_payment_method_detail_body['is3DSAuthentication']
 
     def to_ams_dict(self):
         params = dict()
@@ -441,4 +452,6 @@ def to_ams_dict(self):
             params['payerEmail'] = self.payer_email
         if self.network_transaction_id:
             params['networkTransactionId'] = self.network_transaction_id
+        if self.is_3DS_authentication:
+            params['is3DSAuthentication'] = self.is_3DS_authentication
         return params

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

@@ -21,6 +21,7 @@ def __init__(self):
         self.__extend_info = None
         self.__payment_method_type = None
 
+
     @property
     def payment_method_detail_type(self):
         return self.__payment_method_detail_type
@@ -105,6 +106,7 @@ def parse_rsp_body(self, external_payment_method_detail_body):
         if 'paymentMethodType' in external_payment_method_detail_body:
             self.__payment_method_type = external_payment_method_detail_body['paymentMethodType']
 
+
     def to_ams_dict(self):
         params = dict()
         if self.payment_method_detail_type:
@@ -123,4 +125,5 @@ def to_ams_dict(self):
         if self.payment_method_type:
             params['paymentMethodType'] = self.payment_method_type
 
+
         return params

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

@@ -0,0 +1,40 @@
+class PaymentMethodTypeItem:
+
+    def __init__(self):
+        self.__payment_method_type = None
+        self.__payment_method_order = None
+        self.__express_checkout = None
+
+    @property
+    def payment_method_type(self):
+        return self.__payment_method_type
+
+    @payment_method_type.setter
+    def payment_method_type(self, value):
+        self.__payment_method_type = value
+
+    @property
+    def payment_method_order(self):
+        return self.__payment_method_order
+
+    @payment_method_order.setter
+    def payment_method_order(self, value):
+        self.__payment_method_order = value
+
+    @property
+    def express_checkout(self):
+        return self.__express_checkout
+
+    @express_checkout.setter
+    def express_checkout(self, value):
+        self.__express_checkout = value
+
+    def to_ams_dict(self):
+        params = dict()
+        if hasattr(self, "payment_method_type") and self.payment_method_type:
+            params['paymentMethodType'] = self.payment_method_type
+        if hasattr(self, "payment_method_order") and self.payment_method_order:
+            params['paymentMethodOrder'] = self.payment_method_order
+        if hasattr(self, "express_checkout") and self.express_checkout:
+            params['expressCheckout'] = self.express_checkout.to_ams_dict()
+        return params

com/alipay/ams/api/request/pay/alipay_create_session_request.py

@@ -1,5 +1,6 @@
 import json
 
+from com.alipay.ams.api.model.available_payment_method import AvailablePaymentMethod
 from com.alipay.ams.api.model.agreement_info import AgreementInfo
 from com.alipay.ams.api.model.amount import Amount
 from com.alipay.ams.api.model.antom_path_constants import AntomPathConstants
@@ -33,6 +34,7 @@ def __init__(self):
         self.__product_scene = None
         self.__saved_payment_methods = None # type: list[PaymentMethod]
         self.__locale = None
+        self.__available_payment_method = None # type: list[AvailablePaymentMethod]
 
     @property
     def product_code(self):

setup.cfg

@@ -1,6 +1,6 @@
    [metadata]
    name = global-alipay-sdk-python
-   version = 1.3.9
+   version = 1.4.0
 
    [options]
    packages = find:

setup.py

@@ -12,7 +12,7 @@
 AUTHOR = "guodong.wzj"
 AUTHOR_EMAIL = "[email protected]"
 URL = "https://github.com/alipay/global-open-sdk-python"
-VERSION = "1.3.9"
+VERSION = "1.4.0"
 '''
 only python2 need enum34、pytz
 '''