global-open-sdk-python 1.5.7__tar.gz → 1.5.8__tar.gz

{global_open_sdk_python-1.5.7 → global_open_sdk_python-1.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: global-open-sdk-python
-Version: 1.5.7
+Version: 1.5.8
 Summary: The global alipay gateway SDK for Python.
 Home-page: https://github.com/alipay/global-open-sdk-python
 Author: guodong.wzj

{global_open_sdk_python-1.5.7 → global_open_sdk_python-1.5.8}/README.md

@@ -1,7 +1,7 @@
 ```
 Language：Python  
 Python version：2.7+  
-Release ^1.5.7
+Release ^1.5.8
 Copyright：Ant financial services group  
 ```
 

{global_open_sdk_python-1.5.7 → global_open_sdk_python-1.5.8}/com/alipay/ams/api/_version.py

@@ -1,2 +1,2 @@
-VERSION = "1.5.7"
+VERSION = "1.5.8"
 USER_AGENT = "global-open-sdk-python/" + VERSION

global_open_sdk_python-1.5.8/com/alipay/ams/api/model/account_last_modified.py

@@ -0,0 +1,97 @@
+import json
+
+
+
+
+class AccountLastModified:
+    def __init__(self):
+        
+        self.__password_change_date = None  # type: str
+        self.__email_change_date = None  # type: str
+        self.__listing_change_date = None  # type: str
+        self.__login_date = None  # type: str
+        self.__address_change_date = None  # type: str
+        
+
+    @property
+    def password_change_date(self):
+        """
+        The date and time when the merchant last changed the account password. The value follows the ISO 8601 standard format. For example, \"2019-11-27T12:01:01+08:00\".
+        """
+        return self.__password_change_date
+
+    @password_change_date.setter
+    def password_change_date(self, value):
+        self.__password_change_date = value
+    @property
+    def email_change_date(self):
+        """
+        The date and time when the merchant last changed the account email address. The value follows the ISO 8601 standard format. For example, \"2019-11-27T12:01:01+08:00\".
+        """
+        return self.__email_change_date
+
+    @email_change_date.setter
+    def email_change_date(self, value):
+        self.__email_change_date = value
+    @property
+    def listing_change_date(self):
+        """
+        The date and time when the merchant last changed the account listing information. The value follows the ISO 8601 standard format. For example, \"2019-11-27T12:01:01+08:00\".
+        """
+        return self.__listing_change_date
+
+    @listing_change_date.setter
+    def listing_change_date(self, value):
+        self.__listing_change_date = value
+    @property
+    def login_date(self):
+        """
+        The date and time when the merchant last logged in to the account. The value follows the ISO 8601 standard format. For example, \"2019-11-27T12:01:01+08:00\".
+        """
+        return self.__login_date
+
+    @login_date.setter
+    def login_date(self, value):
+        self.__login_date = value
+    @property
+    def address_change_date(self):
+        """
+        The date and time when the merchant last changed the account address. The value follows the ISO 8601 standard format. For example, \"2019-11-27T12:01:01+08:00\".
+        """
+        return self.__address_change_date
+
+    @address_change_date.setter
+    def address_change_date(self, value):
+        self.__address_change_date = value
+
+
+    
+
+    def to_ams_dict(self):
+        params = dict()
+        if hasattr(self, "password_change_date") and self.password_change_date is not None:
+            params['passwordChangeDate'] = self.password_change_date
+        if hasattr(self, "email_change_date") and self.email_change_date is not None:
+            params['emailChangeDate'] = self.email_change_date
+        if hasattr(self, "listing_change_date") and self.listing_change_date is not None:
+            params['listingChangeDate'] = self.listing_change_date
+        if hasattr(self, "login_date") and self.login_date is not None:
+            params['loginDate'] = self.login_date
+        if hasattr(self, "address_change_date") and self.address_change_date is not None:
+            params['addressChangeDate'] = self.address_change_date
+        return params
+
+
+    def parse_rsp_body(self, response_body):
+        if isinstance(response_body, str): 
+            response_body = json.loads(response_body)
+        if 'passwordChangeDate' in response_body:
+            self.__password_change_date = response_body['passwordChangeDate']
+        if 'emailChangeDate' in response_body:
+            self.__email_change_date = response_body['emailChangeDate']
+        if 'listingChangeDate' in response_body:
+            self.__listing_change_date = response_body['listingChangeDate']
+        if 'loginDate' in response_body:
+            self.__login_date = response_body['loginDate']
+        if 'addressChangeDate' in response_body:
+            self.__address_change_date = response_body['addressChangeDate']

{global_open_sdk_python-1.5.7 → global_open_sdk_python-1.5.8}/com/alipay/ams/api/model/acquirer_info.py

@@ -16,6 +16,7 @@ class AcquirerInfo:
         self.__acquirer_reason_description = None  # type: str
         self.__ptsp_transaction_id = None  # type: str
         self.__acquirer_card_token = None  # type: str
+        self.__acquirer_fingerprint = None  # type: str
         
 
     @property
@@ -118,6 +119,16 @@ class AcquirerInfo:
     @acquirer_card_token.setter
     def acquirer_card_token(self, value):
         self.__acquirer_card_token = value
+    @property
+    def acquirer_fingerprint(self):
+        """
+        An acquirer-generated, irreversible card fingerprint passed through for card identification, reconciliation, and risk deduplication. It is returned only for APO merchants enrolled in fingerprint passthrough when Checkout.com is the acquirer and the original scenario is card vaulting or payment with vaulting. It is not returned in other scenarios and may be empty. Maximum length: 64 characters.
+        """
+        return self.__acquirer_fingerprint
+
+    @acquirer_fingerprint.setter
+    def acquirer_fingerprint(self, value):
+        self.__acquirer_fingerprint = value
 
 
     
@@ -144,6 +155,8 @@ class AcquirerInfo:
             params['ptspTransactionId'] = self.ptsp_transaction_id
         if hasattr(self, "acquirer_card_token") and self.acquirer_card_token is not None:
             params['acquirerCardToken'] = self.acquirer_card_token
+        if hasattr(self, "acquirer_fingerprint") and self.acquirer_fingerprint is not None:
+            params['acquirerFingerprint'] = self.acquirer_fingerprint
         return params
 
 
@@ -170,3 +183,5 @@ class AcquirerInfo:
             self.__ptsp_transaction_id = response_body['ptspTransactionId']
         if 'acquirerCardToken' in response_body:
             self.__acquirer_card_token = response_body['acquirerCardToken']
+        if 'acquirerFingerprint' in response_body:
+            self.__acquirer_fingerprint = response_body['acquirerFingerprint']

global_open_sdk_python-1.5.8/com/alipay/ams/api/model/automatic_tax.py

@@ -0,0 +1,37 @@
+import json
+
+
+
+
+class AutomaticTax:
+    def __init__(self):
+        
+        self.__enabled = None  # type: bool
+        
+
+    @property
+    def enabled(self):
+        """
+        Indicates whether automatic tax is enabled for this payment session. This field is required when automaticTax is provided. true enables automatic tax and false disables it for this session when merchant tax settings exist.
+        """
+        return self.__enabled
+
+    @enabled.setter
+    def enabled(self, value):
+        self.__enabled = value
+
+
+    
+
+    def to_ams_dict(self):
+        params = dict()
+        if hasattr(self, "enabled") and self.enabled is not None:
+            params['enabled'] = self.enabled
+        return params
+
+
+    def parse_rsp_body(self, response_body):
+        if isinstance(response_body, str): 
+            response_body = json.loads(response_body)
+        if 'enabled' in response_body:
+            self.__enabled = response_body['enabled']

{global_open_sdk_python-1.5.7 → global_open_sdk_python-1.5.8}/com/alipay/ams/api/model/available_payment_method.py

@@ -14,7 +14,7 @@ class AvailablePaymentMethod:
     @property
     def payment_method_meta_data(self):
         """
-        Additional information required for some specific payment methods.  
+        Additional information required for some specific payment methods. This object remains free-form. For merchants with the billing-address collection capability enabled, billingAddressCollectionMode controls whether the billing address is collected. Supported values are ALWAYS, DYNAMIC, and NEVER. If this field is omitted, the service uses NEVER.
         """
         return self.__payment_method_meta_data
 

{global_open_sdk_python-1.5.7 → global_open_sdk_python-1.5.8}/com/alipay/ams/api/model/buyer.py

@@ -1,5 +1,8 @@
 import json
 from com.alipay.ams.api.model.user_name import UserName
+from com.alipay.ams.api.model.amount import Amount
+from com.alipay.ams.api.model.buyer_tax_id import BuyerTaxId
+from com.alipay.ams.api.model.address import Address
 
 
 
@@ -15,6 +18,11 @@ class Buyer:
         self.__is_account_verified = None  # type: bool
         self.__successful_order_count = None  # type: int
         self.__buyer_phone_no_contry_code = None  # type: str
+        self.__successful_order_amount = None  # type: Amount
+        self.__date_of_last_paid_purchase = None  # type: str
+        self.__date_of_first_paid_purchase = None  # type: str
+        self.__tax_ids = None  # type: [BuyerTaxId]
+        self.__business_address = None  # type: Address
         
 
     @property
@@ -97,6 +105,56 @@ class Buyer:
     @buyer_phone_no_contry_code.setter
     def buyer_phone_no_contry_code(self, value):
         self.__buyer_phone_no_contry_code = value
+    @property
+    def successful_order_amount(self):
+        """Gets the successful_order_amount of this Buyer.
+        
+        """
+        return self.__successful_order_amount
+
+    @successful_order_amount.setter
+    def successful_order_amount(self, value):
+        self.__successful_order_amount = value
+    @property
+    def date_of_last_paid_purchase(self):
+        """
+        The date and time of the buyer's last paid purchase. When using KLARNA for an e-commerce merchant, this field is required. The value follows the ISO 8601 standard format. For example, \"2019-11-27T12:01:01+08:00\".
+        """
+        return self.__date_of_last_paid_purchase
+
+    @date_of_last_paid_purchase.setter
+    def date_of_last_paid_purchase(self, value):
+        self.__date_of_last_paid_purchase = value
+    @property
+    def date_of_first_paid_purchase(self):
+        """
+        The date and time of the buyer's first paid purchase. When using KLARNA for an e-commerce merchant, this field is required. The value follows the ISO 8601 standard format. For example, \"2019-11-27T12:01:01+08:00\".
+        """
+        return self.__date_of_first_paid_purchase
+
+    @date_of_first_paid_purchase.setter
+    def date_of_first_paid_purchase(self, value):
+        self.__date_of_first_paid_purchase = value
+    @property
+    def tax_ids(self):
+        """
+        For createPaymentSession, these buyer tax IDs are used for B2B or reverse-charge determination when automatic tax is active. If omitted, null, invalid, or unusable, Antom calculates tax as B2C instead of rejecting the payment session. Because Buyer is a shared SDK model, omit this field in APIs that do not explicitly document support. Maximum size: 10.
+        """
+        return self.__tax_ids
+
+    @tax_ids.setter
+    def tax_ids(self, value):
+        self.__tax_ids = value
+    @property
+    def business_address(self):
+        """Gets the business_address of this Buyer.
+        
+        """
+        return self.__business_address
+
+    @business_address.setter
+    def business_address(self, value):
+        self.__business_address = value
 
 
     
@@ -119,6 +177,16 @@ class Buyer:
             params['successfulOrderCount'] = self.successful_order_count
         if hasattr(self, "buyer_phone_no_contry_code") and self.buyer_phone_no_contry_code is not None:
             params['buyerPhoneNoContryCode'] = self.buyer_phone_no_contry_code
+        if hasattr(self, "successful_order_amount") and self.successful_order_amount is not None:
+            params['successfulOrderAmount'] = self.successful_order_amount
+        if hasattr(self, "date_of_last_paid_purchase") and self.date_of_last_paid_purchase is not None:
+            params['dateOfLastPaidPurchase'] = self.date_of_last_paid_purchase
+        if hasattr(self, "date_of_first_paid_purchase") and self.date_of_first_paid_purchase is not None:
+            params['dateOfFirstPaidPurchase'] = self.date_of_first_paid_purchase
+        if hasattr(self, "tax_ids") and self.tax_ids is not None:
+            params['taxIds'] = self.tax_ids
+        if hasattr(self, "business_address") and self.business_address is not None:
+            params['businessAddress'] = self.business_address
         return params
 
 
@@ -142,3 +210,19 @@ class Buyer:
             self.__successful_order_count = response_body['successfulOrderCount']
         if 'buyerPhoneNoContryCode' in response_body:
             self.__buyer_phone_no_contry_code = response_body['buyerPhoneNoContryCode']
+        if 'successfulOrderAmount' in response_body:
+            self.__successful_order_amount = Amount()
+            self.__successful_order_amount.parse_rsp_body(response_body['successfulOrderAmount'])
+        if 'dateOfLastPaidPurchase' in response_body:
+            self.__date_of_last_paid_purchase = response_body['dateOfLastPaidPurchase']
+        if 'dateOfFirstPaidPurchase' in response_body:
+            self.__date_of_first_paid_purchase = response_body['dateOfFirstPaidPurchase']
+        if 'taxIds' in response_body:
+            self.__tax_ids = []
+            for item in response_body['taxIds']:
+                obj = BuyerTaxId()
+                obj.parse_rsp_body(item)
+                self.__tax_ids.append(obj)
+        if 'businessAddress' in response_body:
+            self.__business_address = Address()
+            self.__business_address.parse_rsp_body(response_body['businessAddress'])

global_open_sdk_python-1.5.8/com/alipay/ams/api/model/buyer_tax_id.py

@@ -0,0 +1,67 @@
+import json
+
+
+
+
+class BuyerTaxId:
+    def __init__(self):
+        
+        self.__country = None  # type: str
+        self.__region = None  # type: str
+        self.__value = None  # type: str
+        
+
+    @property
+    def country(self):
+        """
+        The two-letter ISO 3166-1 alpha-2 country or region code used to validate the tax ID. Maximum length: 2 characters.
+        """
+        return self.__country
+
+    @country.setter
+    def country(self, value):
+        self.__country = value
+    @property
+    def region(self):
+        """
+        The two-character country-specific subdivision code. Required only when the applicable tax authority or country or region rule requires subdivision-level identification. Maximum length: 2 characters.
+        """
+        return self.__region
+
+    @region.setter
+    def region(self, value):
+        self.__region = value
+    @property
+    def value(self):
+        """
+        The buyer tax ID value. The accepted format is country-specific. Maximum length: 64 characters.
+        """
+        return self.__value
+
+    @value.setter
+    def value(self, value):
+        self.__value = value
+
+
+    
+
+    def to_ams_dict(self):
+        params = dict()
+        if hasattr(self, "country") and self.country is not None:
+            params['country'] = self.country
+        if hasattr(self, "region") and self.region is not None:
+            params['region'] = self.region
+        if hasattr(self, "value") and self.value is not None:
+            params['value'] = self.value
+        return params
+
+
+    def parse_rsp_body(self, response_body):
+        if isinstance(response_body, str): 
+            response_body = json.loads(response_body)
+        if 'country' in response_body:
+            self.__country = response_body['country']
+        if 'region' in response_body:
+            self.__region = response_body['region']
+        if 'value' in response_body:
+            self.__value = response_body['value']

{global_open_sdk_python-1.5.7 → global_open_sdk_python-1.5.8}/com/alipay/ams/api/model/goods.py

@@ -22,6 +22,8 @@ class Goods:
         self.__goods_discount_amount = None  # type: Amount
         self.__goods_ends_on_time = None  # type: str
         self.__cross_sell = None  # type: Goods
+        self.__tax_code = None  # type: str
+        self.__tax_behavior = None  # type: str
         
 
     @property
@@ -116,8 +118,8 @@ class Goods:
         self.__delivery_method_type = value
     @property
     def goods_image_url(self):
-        """Gets the goods_image_url of this Goods.
-        
+        """
+        The URL of the goods image. When using KLARNA, this value is used to display the goods image in the payment method app and must not exceed 1024 characters.
         """
         return self.__goods_image_url
 
@@ -164,6 +166,26 @@ class Goods:
     @cross_sell.setter
     def cross_sell(self, value):
         self.__cross_sell = value
+    @property
+    def tax_code(self):
+        """
+        For createPaymentSession, this is the product tax code used by Antom GlobalTax to classify the goods line. When automatic tax is active, omit it to use the merchant default tax code. Because Goods is a shared SDK model, omit this field in APIs that do not explicitly document support. Maximum length: 64 characters.
+        """
+        return self.__tax_code
+
+    @tax_code.setter
+    def tax_code(self, value):
+        self.__tax_code = value
+    @property
+    def tax_behavior(self):
+        """
+        For createPaymentSession, this value indicates whether the goods-line price excludes or includes tax. Supported values are EXCLUSIVE and INCLUSIVE. When automatic tax is active, omit it to use the merchant tax behavior settings. Because Goods is a shared SDK model, omit this field in APIs that do not explicitly document support. Maximum length: 16 characters.
+        """
+        return self.__tax_behavior
+
+    @tax_behavior.setter
+    def tax_behavior(self, value):
+        self.__tax_behavior = value
 
 
     
@@ -198,6 +220,10 @@ class Goods:
             params['goodsEndsOnTime'] = self.goods_ends_on_time
         if hasattr(self, "cross_sell") and self.cross_sell is not None:
             params['crossSell'] = self.cross_sell
+        if hasattr(self, "tax_code") and self.tax_code is not None:
+            params['taxCode'] = self.tax_code
+        if hasattr(self, "tax_behavior") and self.tax_behavior is not None:
+            params['taxBehavior'] = self.tax_behavior
         return params
 
 
@@ -235,3 +261,7 @@ class Goods:
         if 'crossSell' in response_body:
             self.__cross_sell = Goods()
             self.__cross_sell.parse_rsp_body(response_body['crossSell'])
+        if 'taxCode' in response_body:
+            self.__tax_code = response_body['taxCode']
+        if 'taxBehavior' in response_body:
+            self.__tax_behavior = response_body['taxBehavior']

{global_open_sdk_python-1.5.7 → global_open_sdk_python-1.5.8}/com/alipay/ams/api/model/leg.py

@@ -22,6 +22,8 @@ class Leg:
         self.__coupon_number = None  # type: str
         self.__flight_number = None  # type: str
         self.__passenger_name_record = None  # type: str
+        self.__ticket_delivery_method = None  # type: str
+        self.__ticket_delivery_recipient = None  # type: str
         
 
     @property
@@ -154,6 +156,26 @@ class Leg:
     @passenger_name_record.setter
     def passenger_name_record(self, value):
         self.__passenger_name_record = value
+    @property
+    def ticket_delivery_method(self):
+        """
+        The ticket delivery method. Valid values are: pick_up (the ticket is picked up in person), email (the ticket is sent by email), post (the ticket is sent by post), and phone (the ticket is sent to a phone number).
+        """
+        return self.__ticket_delivery_method
+
+    @ticket_delivery_method.setter
+    def ticket_delivery_method(self, value):
+        self.__ticket_delivery_method = value
+    @property
+    def ticket_delivery_recipient(self):
+        """
+        The ticket recipient. For email, specify the recipient's email address. For phone, specify the recipient's phone number. For pick_up and post, specify the recipient's first and last name, for example, John Doe.
+        """
+        return self.__ticket_delivery_recipient
+
+    @ticket_delivery_recipient.setter
+    def ticket_delivery_recipient(self, value):
+        self.__ticket_delivery_recipient = value
 
 
     
@@ -186,6 +208,10 @@ class Leg:
             params['flightNumber'] = self.flight_number
         if hasattr(self, "passenger_name_record") and self.passenger_name_record is not None:
             params['passengerNameRecord'] = self.passenger_name_record
+        if hasattr(self, "ticket_delivery_method") and self.ticket_delivery_method is not None:
+            params['ticketDeliveryMethod'] = self.ticket_delivery_method
+        if hasattr(self, "ticket_delivery_recipient") and self.ticket_delivery_recipient is not None:
+            params['ticketDeliveryRecipient'] = self.ticket_delivery_recipient
         return params
 
 
@@ -221,3 +247,7 @@ class Leg:
             self.__flight_number = response_body['flightNumber']
         if 'passengerNameRecord' in response_body:
             self.__passenger_name_record = response_body['passengerNameRecord']
+        if 'ticketDeliveryMethod' in response_body:
+            self.__ticket_delivery_method = response_body['ticketDeliveryMethod']
+        if 'ticketDeliveryRecipient' in response_body:
+            self.__ticket_delivery_recipient = response_body['ticketDeliveryRecipient']

{global_open_sdk_python-1.5.7 → global_open_sdk_python-1.5.8}/com/alipay/ams/api/model/lodging.py

@@ -15,6 +15,9 @@ class Lodging:
         self.__number_of_nights = None  # type: int
         self.__number_of_rooms = None  # type: int
         self.__guest_names = None  # type: [UserName]
+        self.__room_class = None  # type: str
+        self.__ticket_delivery_method = None  # type: str
+        self.__ticket_delivery_recipient = None  # type: str
         
 
     @property
@@ -87,6 +90,36 @@ class Lodging:
     @guest_names.setter
     def guest_names(self, value):
         self.__guest_names = value
+    @property
+    def room_class(self):
+        """
+        The hotel room type, for example, Presidential suite.
+        """
+        return self.__room_class
+
+    @room_class.setter
+    def room_class(self, value):
+        self.__room_class = value
+    @property
+    def ticket_delivery_method(self):
+        """
+        The ticket delivery method. Valid values are: pick_up (the ticket is picked up in person), email (the ticket is sent by email), post (the ticket is sent by post), and phone (the ticket is sent to a phone number).
+        """
+        return self.__ticket_delivery_method
+
+    @ticket_delivery_method.setter
+    def ticket_delivery_method(self, value):
+        self.__ticket_delivery_method = value
+    @property
+    def ticket_delivery_recipient(self):
+        """
+        The ticket recipient. For email, specify the recipient's email address. For phone, specify the recipient's phone number. For pick_up and post, specify the recipient's first and last name, for example, John Doe.
+        """
+        return self.__ticket_delivery_recipient
+
+    @ticket_delivery_recipient.setter
+    def ticket_delivery_recipient(self, value):
+        self.__ticket_delivery_recipient = value
 
 
     
@@ -107,6 +140,12 @@ class Lodging:
             params['numberOfRooms'] = self.number_of_rooms
         if hasattr(self, "guest_names") and self.guest_names is not None:
             params['guestNames'] = self.guest_names
+        if hasattr(self, "room_class") and self.room_class is not None:
+            params['roomClass'] = self.room_class
+        if hasattr(self, "ticket_delivery_method") and self.ticket_delivery_method is not None:
+            params['ticketDeliveryMethod'] = self.ticket_delivery_method
+        if hasattr(self, "ticket_delivery_recipient") and self.ticket_delivery_recipient is not None:
+            params['ticketDeliveryRecipient'] = self.ticket_delivery_recipient
         return params
 
 
@@ -132,3 +171,9 @@ class Lodging:
                 obj = UserName()
                 obj.parse_rsp_body(item)
                 self.__guest_names.append(obj)
+        if 'roomClass' in response_body:
+            self.__room_class = response_body['roomClass']
+        if 'ticketDeliveryMethod' in response_body:
+            self.__ticket_delivery_method = response_body['ticketDeliveryMethod']
+        if 'ticketDeliveryRecipient' in response_body:
+            self.__ticket_delivery_recipient = response_body['ticketDeliveryRecipient']

{global_open_sdk_python-1.5.7 → global_open_sdk_python-1.5.8}/com/alipay/ams/api/model/merchant.py

@@ -2,6 +2,7 @@ import json
 from com.alipay.ams.api.model.address import Address
 from com.alipay.ams.api.model.store import Store
 from com.alipay.ams.api.model.merchant_type import MerchantType
+from com.alipay.ams.api.model.account_last_modified import AccountLastModified
 
 
 
@@ -17,6 +18,8 @@ class Merchant:
         self.__merchant_register_date = None  # type: str
         self.__store = None  # type: Store
         self.__merchant_type = None  # type: MerchantType
+        self.__number_of_trades = None  # type: int
+        self.__account_last_modified = None  # type: AccountLastModified
         
 
     @property
@@ -99,6 +102,26 @@ class Merchant:
     @merchant_type.setter
     def merchant_type(self, value):
         self.__merchant_type = value
+    @property
+    def number_of_trades(self):
+        """
+        The number of orders completed by the merchant in the past 12 months. When using KLARNA for an e-commerce merchant, this field is required. Value range: 0 to unlimited.
+        """
+        return self.__number_of_trades
+
+    @number_of_trades.setter
+    def number_of_trades(self, value):
+        self.__number_of_trades = value
+    @property
+    def account_last_modified(self):
+        """Gets the account_last_modified of this Merchant.
+        
+        """
+        return self.__account_last_modified
+
+    @account_last_modified.setter
+    def account_last_modified(self, value):
+        self.__account_last_modified = value
 
 
     
@@ -121,6 +144,10 @@ class Merchant:
             params['store'] = self.store
         if hasattr(self, "merchant_type") and self.merchant_type is not None:
             params['merchantType'] = self.merchant_type
+        if hasattr(self, "number_of_trades") and self.number_of_trades is not None:
+            params['numberOfTrades'] = self.number_of_trades
+        if hasattr(self, "account_last_modified") and self.account_last_modified is not None:
+            params['accountLastModified'] = self.account_last_modified
         return params
 
 
@@ -146,3 +173,8 @@ class Merchant:
         if 'merchantType' in response_body:
             merchant_type_temp = MerchantType.value_of(response_body['merchantType'])
             self.__merchant_type = merchant_type_temp
+        if 'numberOfTrades' in response_body:
+            self.__number_of_trades = response_body['numberOfTrades']
+        if 'accountLastModified' in response_body:
+            self.__account_last_modified = AccountLastModified()
+            self.__account_last_modified.parse_rsp_body(response_body['accountLastModified'])