update version

Author: wangzunjiao

README.md

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

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

@@ -0,0 +1,40 @@
+import json
+
+
+class PaymentAttempt:
+    def __init__(self):
+        self.__attemptAt = None  # type: str
+        self.__attempt_response = None  # type: str
+
+
+    @property
+    def attemptAt(self):
+        return self.__attemptAt
+
+    @attemptAt.setter
+    def attemptAt(self, value):
+        self.__attemptAt = value
+        
+    @property
+    def attempt_response(self):
+        return self.__attempt_response
+    @attempt_response.setter
+    def attempt_response(self, value):
+        self.__attempt_response = value
+
+    def to_ams_dict(self):
+        params = dict()
+        if hasattr(self, "attemptAt") and self.attemptAt is not None:
+            params['attemptAt'] = self.attemptAt
+        if hasattr(self, "attempt_response") and self.attempt_response is not None:
+            params['attempt_response'] = self.attempt_response
+        return params
+
+
+    def parse_rsp_body(self, response_body):
+        if isinstance(response_body, str):
+            response_body = json.loads(response_body)
+        if 'attemptAt' in response_body:
+            self.__attemptAt = response_body['attemptAt']
+        if 'attempt_response' in response_body:
+            self.__attempt_response = response_body['attempt_response']

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

@@ -0,0 +1,45 @@
+import json
+
+from com.alipay.ams.api.model.payment_attempt import PaymentAttempt
+
+
+class RetryInfo:
+    def __init__(self):
+        self.__available_retries = None # type: int
+        self.__payment_attempts = None # type: list: PaymentAttempt
+
+
+    @property
+    def available_retries(self):
+        return self.__available_retries
+
+    @available_retries.setter
+    def available_retries(self, value):
+        self.__available_retries = value
+
+
+    @property
+    def payment_attempts(self):
+        return self.__payment_attempts
+
+    @payment_attempts.setter
+    def payment_attempts(self, value):
+        self.__payment_attempts = value
+
+
+    def to_ams_dict(self):
+        params = dict()
+        if self.__available_retries:
+            params['availableRetries'] = self.__available_retries
+        if self.__payment_attempts:
+            params['paymentAttempts'] = [i.to_ams_dict() for i in self.__payment_attempts]
+        return params
+
+
+    def parse_rsp_body(self, response_body):
+        if isinstance(response_body, str):
+            response_body = json.loads(response_body)
+        if 'availableRetries' in response_body:
+            self.__available_retries = response_body['availableRetries']
+        if 'paymentAttempts' in response_body:
+            self.__payment_attempts = [PaymentAttempt().parse_rsp_body(i) for i in response_body['paymentAttempts']]

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

@@ -213,6 +213,8 @@ def parse_rsp_body(self, response_body):
             self.__fund_move_detail = FundMoveDetail()
             self.__fund_move_detail.parse_rsp_body(response_body['fundMoveDetail'])
         if 'foreignExchangeQuote' in response_body:
+            self.__foreign_exchange_quote = ForeignExchangeQuote()
+            self.__foreign_exchange_quote.parse_rsp_body(response_body['foreignExchangeQuote'])
         if 'statementId' in response_body:
             self.__statement_id = response_body['statementId']
         if 'transactionTime' in response_body:

com/alipay/ams/api/request/notify/alipay_pay_result_notify.py

@@ -1,3 +1,5 @@
+from com.alipay.ams.api.model.refund_to_bank_info import RefundToBankInfo
+from com.alipay.ams.api.model.retry_info import RetryInfo
 from com.alipay.ams.api.request.notify.alipay_notify import AlipayNotify
 
 
@@ -20,6 +22,9 @@ def __init__(self, notify_body):
         self.__promotion_result = None
         self.__payment_method_type = None
         self.__metadata = None  # type: str
+        self.__subscriptionOrderId = None
+        self.__subscription_id = None # type: str
+        self.__retry_info = None # type: RetryInfo
         self.__parse_notify_body(notify_body)
 
     @property
@@ -82,6 +87,21 @@ def payment_method_type(self):
     def metadata(self):
         return self.__metadata
 
+    @property
+    def subscription_order_id(self):
+        return self.__subscriptionOrderId
+
+    @subscription_order_id.setter
+    def subscription_order_id(self, value):
+        self.__subscriptionOrderId = value
+
+    @property
+    def retry_info(self):
+        return self.__retry_info
+    @retry_info.setter
+    def retry_info(self, value):
+        self.__retry_info = value
+
     def __parse_notify_body(self, notify_body):
         notify = super(AlipayPayResultNotify, self).parse_notify_body(notify_body)
         if "paymentRequestId" in notify:
@@ -114,4 +134,8 @@ def __parse_notify_body(self, notify_body):
         if "paymentMethodType" in notify:
             self.__payment_method_type = notify["paymentMethodType"]
         if "metadata" in notify:
-            self.__metadata = notify["metadata"]
+            self.__metadata = notify["metadata"]
+        if "subscriptionOrderId" in notify:
+            self.__subscriptionOrderId = notify["subscriptionOrderId"]
+        if "retryInfo" in notify:
+            self.__retry_info = notify["retryInfo"]

com/alipay/ams/api/request/notify/alipay_subscription_cancel_notify.py

@@ -0,0 +1,164 @@
+import json
+from typing import Optional, Any, Dict
+
+from com.alipay.ams.api.model.amount import Amount
+from com.alipay.ams.api.request.notify.alipay_notify import AlipayNotify
+
+
+class AlipaySubscriptionCancelNotify(AlipayNotify):
+    def __init__(self, notify_body):
+        super(AlipaySubscriptionCancelNotify, self).__init__()
+        self.__payment_amount = None  # type: Optional[PaymentAmount]
+        self.__payment_create_time = None  # type: Optional[str]
+        self.__payment_time = None  # type: Optional[str]
+        self.__period_end_time = None  # type: Optional[str]
+        self.__phase_no = None  # type: Optional[str]
+        self.__subscription_id = None  # type: Optional[str]
+        self.__subscription_order_id = None  # type: Optional[str]
+        self.__subscription_order_status = None  # type: Optional[str]
+        self.__subscription_request_id = None  # type: Optional[str]
+        self.__subscription_trans_id = None  # type: Optional[str]
+        self.__parse_notify_body(notify_body)
+
+    # --- Properties for payment_amount ---
+    @property
+    def payment_amount(self) -> Optional['PaymentAmount']:
+        return self.__payment_amount
+
+    @payment_amount.setter
+    def payment_amount(self, value: Optional['PaymentAmount']):
+        self.__payment_amount = value
+
+    # --- Properties for payment_create_time ---
+    @property
+    def payment_create_time(self) -> Optional[str]:
+        return self.__payment_create_time
+
+    @payment_create_time.setter
+    def payment_create_time(self, value: Optional[str]):
+        self.__payment_create_time = value
+
+    # --- Properties for payment_time ---
+    @property
+    def payment_time(self) -> Optional[str]:
+        return self.__payment_time
+
+    @payment_time.setter
+    def payment_time(self, value: Optional[str]):
+        self.__payment_time = value
+
+    # --- Properties for period_end_time ---
+    @property
+    def period_end_time(self) -> Optional[str]:
+        return self.__period_end_time
+
+    @period_end_time.setter
+    def period_end_time(self, value: Optional[str]):
+        self.__period_end_time = value
+
+    # --- Properties for phase_no ---
+    @property
+    def phase_no(self) -> Optional[str]:
+        return self.__phase_no
+
+    @phase_no.setter
+    def phase_no(self, value: Optional[str]):
+        self.__phase_no = value
+
+
+    # --- Properties for subscription_id ---
+    @property
+    def subscription_id(self) -> Optional[str]:
+        return self.__subscription_id
+
+    @subscription_id.setter
+    def subscription_id(self, value: Optional[str]):
+        self.__subscription_id = value
+
+    # --- Properties for subscription_order_id ---
+    @property
+    def subscription_order_id(self) -> Optional[str]:
+        return self.__subscription_order_id
+
+    @subscription_order_id.setter
+    def subscription_order_id(self, value: Optional[str]):
+        self.__subscription_order_id = value
+
+    # --- Properties for subscription_order_status ---
+    @property
+    def subscription_order_status(self) -> Optional[str]:
+        return self.__subscription_order_status
+
+    @subscription_order_status.setter
+    def subscription_order_status(self, value: Optional[str]):
+        self.__subscription_order_status = value
+
+    # --- Properties for subscription_request_id ---
+    @property
+    def subscription_request_id(self) -> Optional[str]:
+        return self.__subscription_request_id
+
+    @subscription_request_id.setter
+    def subscription_request_id(self, value: Optional[str]):
+        self.__subscription_request_id = value
+
+    # --- Properties for subscription_trans_id ---
+    @property
+    def subscription_trans_id(self) -> Optional[str]:
+        return self.__subscription_trans_id
+
+    @subscription_trans_id.setter
+    def subscription_trans_id(self, value: Optional[str]):
+        self.__subscription_trans_id = value
+
+    def to_ams_dict(self) -> Dict[str, Any]:
+        """Convert object to dictionary with camelCase keys for AMS API."""
+        params = {}
+
+        if self.payment_amount is not None:
+            params['paymentAmount'] = self.payment_amount.to_ams_dict()
+        if self.payment_create_time is not None:
+            params['paymentCreateTime'] = self.payment_create_time
+        if self.payment_time is not None:
+            params['paymentTime'] = self.payment_time
+        if self.period_end_time is not None:
+            params['periodEndTime'] = self.period_end_time
+        if self.phase_no is not None:
+            params['phaseNo'] = self.phase_no
+        if self.subscription_id is not None:
+            params['subscriptionId'] = self.subscription_id
+        if self.subscription_order_id is not None:
+            params['subscriptionOrderId'] = self.subscription_order_id
+        if self.subscription_order_status is not None:
+            params['subscriptionOrderStatus'] = self.subscription_order_status
+        if self.subscription_request_id is not None:
+            params['subscriptionRequestId'] = self.subscription_request_id
+        if self.subscription_trans_id is not None:
+            params['subscriptionTransId'] = self.subscription_trans_id
+
+        return params
+
+    def __parse_notify_body(self, notify_body):
+        notify = super(AlipaySubscriptionCancelNotify, self).parse_notify_body(notify_body)
+        if "paymentAmount" in notify:
+            from com.alipay.ams.api.model.amount import Amount
+            self.__payment_amount = Amount()
+            self.__payment_amount.parse_rsp_body(notify["paymentAmount"])
+        if "paymentCreateTime" in notify:
+            self.__payment_create_time = notify["paymentCreateTime"]
+        if "paymentTime" in notify:
+            self.__payment_time = notify["paymentTime"]
+        if "periodEndTime" in notify:
+            self.__period_end_time = notify["periodEndTime"]
+        if "phaseNo" in notify:
+            self.__phase_no = notify["phaseNo"]
+        if "subscriptionId" in notify:
+            self.__subscription_id = notify["subscriptionId"]
+        if "subscriptionOrderId" in notify:
+            self.__subscription_order_id = notify["subscriptionOrderId"]
+        if "subscriptionOrderStatus" in notify:
+            self.__subscription_order_status = notify["subscriptionOrderStatus"]
+        if "subscriptionRequestId" in notify:
+            self.__subscription_request_id = notify["subscriptionRequestId"]
+        if "subscriptionTransId" in notify:
+            self.__subscription_trans_id = notify["subscriptionTransId"]

setup.cfg

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

setup.py

@@ -12,7 +12,7 @@
 AUTHOR = "guodong.wzj"
 AUTHOR_EMAIL = "wangzunjiao.wzj@digital-engine.com"
 URL = "https://github.com/alipay/global-open-sdk-python"
-VERSION = "1.4.25"
+VERSION = "1.4.26"
 """
 only python2 need enum34、pytz
 """