fix: cr issues

覆盖订阅支付

Author: wangzunjiao

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

@@ -0,0 +1,35 @@
+import json
+
+
+class AgreementInfo(object):
+    def __int__(self):
+        self.__auth_state = None
+        self.__user_login_id = None
+
+    @property
+    def auth_state(self):
+        return self.__auth_state
+
+    @auth_state.setter
+    def auth_state(self, value):
+        self.__auth_state = value
+
+    @property
+    def user_login_id(self):
+        return self.__user_login_id
+
+    @user_login_id.setter
+    def user_login_id(self, value):
+        self.__user_login_id = 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 self.__auth_state is not None:
+            params['authState'] = self.__auth_state
+        if self.__user_login_id is not None:
+            params['userLoginId'] = self.__user_login_id
+        return params

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

@@ -3,7 +3,7 @@
 
 class AuthCodeForm(object):
     def __init__(self):
-        self.codeDetails = None  # type: list: CodeDetail
+        self.codeDetails = None  # type: list[CodeDetail]
 
     @property
     def code_details(self):

com/alipay/ams/api/model/BusinessType.py renamed to com/alipay/ams/api/model/business_type.py

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

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

@@ -16,10 +16,10 @@ def __init__(self):
         self.__brand = None
         self.__card_issuer = None
         self.__country_issue = None
-        self.__inst_user_name = None
+        self.__inst_user_name = None #type: UserName
         self.__expiry_year = None
         self.__expiry_month = None
-        self.__billing_address = None
+        self.__billing_address = None #type: Address
         self.__mask = None
         self.__last4 = None
         self.__payment_method_detail_metadata = None

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

@@ -10,7 +10,7 @@ class CouponPaymentMethodDetail(object):
 
     def __init__(self):
         self.__coupon_id = None
-        self.__available_amount = None
+        self.__available_amount = None #type: Amount
         self.__coupon_name = None
         self.__coupon_description = None
         self.__coupon_expire_time = None

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

@@ -145,34 +145,34 @@ def to_ams_dict(self):
             params['customsDeclarationReturnTime'] = self.customs_declaration_return_time
         return params
 
-    def parse_rsp_body(self, amount_body):
-        if type(amount_body) == str:
-            amount_body = json.loads(amount_body)
-
-        if 'declarationRequestId' in amount_body:
-            self.declaration_request_id = amount_body['declarationRequestId']
-        if 'customsPaymentId' in amount_body:
-            self.customs_payment_id = amount_body['customsPaymentId']
-        if 'customsOrderId' in amount_body:
-            self.customs_order_id = amount_body['customsOrderId']
-        if 'customs' in amount_body:
+    def parse_rsp_body(self, declaration_record_body):
+        if type(declaration_record_body) == str:
+            declaration_record_body = json.loads(declaration_record_body)
+
+        if 'declarationRequestId' in declaration_record_body:
+            self.declaration_request_id = declaration_record_body['declarationRequestId']
+        if 'customsPaymentId' in declaration_record_body:
+            self.customs_payment_id = declaration_record_body['customsPaymentId']
+        if 'customsOrderId' in declaration_record_body:
+            self.customs_order_id = declaration_record_body['customsOrderId']
+        if 'customs' in declaration_record_body:
             self.customs = CustomsInfo()
-            self.customs.parse_rsp_body(amount_body['customs'])
-        if 'merchantCustomsInfo' in amount_body:
+            self.customs.parse_rsp_body(declaration_record_body['customs'])
+        if 'merchantCustomsInfo' in declaration_record_body:
             self.merchant_customs_info = MerchantCustomsInfo()
-            self.merchant_customs_info.parse_rsp_body(amount_body['merchantCustomsInfo'])
-        if 'declarationAmount' in amount_body:
+            self.merchant_customs_info.parse_rsp_body(declaration_record_body['merchantCustomsInfo'])
+        if 'declarationAmount' in declaration_record_body:
             self.declaration_amount = Amount()
-            self.declaration_amount.parse_rsp_body(amount_body['declarationAmount'])
-        if 'splitOrder' in amount_body:
-            self.split_order = amount_body['splitOrder']
-        if 'declarationRequestStatus' in amount_body:
-            self.declaration_request_status = amount_body['declarationRequestStatus']
-        if 'lastModifiedTime' in amount_body:
-            self.last_modified_time = amount_body['lastModifiedTime']
-        if 'customsDeclarationResultCode' in amount_body:
-            self.customs_declaration_result_code = amount_body['customsDeclarationResultCode']
-        if 'customsDeclarationResultDesc' in amount_body:
-            self.customs_declaration_result_desc = amount_body['customsDeclarationResultDesc']
-        if 'customsDeclarationReturnTime' in amount_body:
-            self.customs_declaration_return_time = amount_body['customsDeclarationReturnTime']
+            self.declaration_amount.parse_rsp_body(declaration_record_body['declarationAmount'])
+        if 'splitOrder' in declaration_record_body:
+            self.split_order = declaration_record_body['splitOrder']
+        if 'declarationRequestStatus' in declaration_record_body:
+            self.declaration_request_status = declaration_record_body['declarationRequestStatus']
+        if 'lastModifiedTime' in declaration_record_body:
+            self.last_modified_time = declaration_record_body['lastModifiedTime']
+        if 'customsDeclarationResultCode' in declaration_record_body:
+            self.customs_declaration_result_code = declaration_record_body['customsDeclarationResultCode']
+        if 'customsDeclarationResultDesc' in declaration_record_body:
+            self.customs_declaration_result_desc = declaration_record_body['customsDeclarationResultDesc']
+        if 'customsDeclarationReturnTime' in declaration_record_body:
+            self.customs_declaration_return_time = declaration_record_body['customsDeclarationReturnTime']

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

@@ -34,14 +34,14 @@ def to_ams_dict(self):
             params['savingsAmount'] = self.savingsAmount.to_ams_dict()
         return params
 
-    def parse_rsp_body(self, amount_body):
-        if type(amount_body) == str:
-            amount_body = json.loads(amount_body)
+    def parse_rsp_body(self, discount_body):
+        if type(discount_body) == str:
+            discount_body = json.loads(discount_body)
 
-        if 'discountName' in amount_body:
-            self.discountName = amount_body['discountName']
+        if 'discountName' in discount_body:
+            self.discountName = discount_body['discountName']
 
-        if 'savingsAmount' in amount_body:
+        if 'savingsAmount' in discount_body:
             payment_amount = Amount()
-            payment_amount.parse_rsp_body(amount_body['savingsAmount'])
+            payment_amount.parse_rsp_body(discount_body['savingsAmount'])
             self.__savingsAmount = payment_amount

com/alipay/ams/api/model/DisableReasonType.py renamed to com/alipay/ams/api/model/disable_reason_type.py

@@ -10,7 +10,7 @@ class DiscountPaymentMethodDetail(object):
 
     def __init__(self):
         self.__discount_id = None
-        self.__available_amount = None
+        self.__available_amount = None #type: Amount
         self.__discount_name = None
         self.__discount_description = None
         self.__payment_method_detail_metadata = None