Merge pull request #8 from alipay/feature_align_doc_fields

Feature align doc fields

Author: ScottWryyyyy

README.md

@@ -1,12 +1,12 @@
 ```
 Language：Python  
-Python version：2.6+  
+Python version：2.7+  
 Copyright：Ant financial services group  
 ```
 
 #### 1 The sample for pay 
 ```
-    default_alipay_client = DefaultAlipayClient("https://open-na.alipay.com", client_id, MERCHANT_PRIVATE_KEY, ALIPAY_PUBLICK_KEY)
+    default_alipay_client = DefaultAlipayClient("https://open-na.alipay.com", client_id, MERCHANT_PRIVATE_KEY, ALIPAY_PUBLIC_KEY)
 
     alipay_pay_request = AlipayPayRequest()
     alipay_pay_request.path = "/ams/sandbox/api/v1/payments/pay"

com/alipay/ams/api/default_alipay_client.py

@@ -17,6 +17,7 @@ def __init__(self, gateway_url, client_id, merchant_private_key, alipay_public_k
     """
     内部方法，生成请求签名
     """
+
     def __gen_sign(self, http_method, path, client_id, req_time, req_body):
         try:
             sign_value = sign(http_method, path, client_id, req_time, req_body, self.__merchant_private_key)
@@ -27,9 +28,11 @@ def __gen_sign(self, http_method, path, client_id, req_time, req_body):
     """
     内部方法，生成请求签名
     """
+
     def __verify_sign(self, http_method, path, client_id, rsp_time, rsp_body, rsp_signature):
         try:
-            is_verify = verify(http_method, path, client_id, rsp_time, rsp_body, rsp_signature, self.__alipay_public_key)
+            is_verify = verify(http_method, path, client_id, rsp_time, rsp_body, rsp_signature,
+                               self.__alipay_public_key)
         except Exception as e:
             raise AlipayApiException("response verify failed. " + str(e))
         return is_verify

com/alipay/ams/api/exception/exception.py

@@ -4,4 +4,3 @@
 
 class AlipayApiException(ValueError):
     pass
-

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

@@ -118,4 +118,4 @@ def parse_rsp_body(self, address_body):
             self.__zip_code = address_body['zipCode']
 
         if 'label' in address_body:
-            self.__label = address_body['label']
+            self.__label = address_body['label']

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

@@ -0,0 +1,35 @@
+import json
+
+
+class AgreementInfo(object):
+    def __init__(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

@@ -0,0 +1,20 @@
+from com.alipay.ams.api.model.code_detail import CodeDetail
+
+
+class AuthCodeForm(object):
+    def __init__(self):
+        self.codeDetails = None  # type: list[CodeDetail]
+
+    @property
+    def code_details(self):
+        return self.codeDetails
+
+    @code_details.setter
+    def code_details(self, value):
+        self.codeDetails = value
+
+    def to_ams_dict(self):
+        params = dict()
+        if self.codeDetails is not None:
+            params['codeDetails'] = [item.to_ams_dict() for item in self.codeDetails]
+        return params

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

@@ -0,0 +1,65 @@
+class BrowserInfo(object):
+    def __init__(self):
+        self.__accept_header = None
+        self.__java_enabled = None
+        self.__java_script_enabled = None
+        self.__language = None
+        self.__user_agent = None
+
+    @property
+    def accept_header(self):
+        return self.__accept_header
+
+    @accept_header.setter
+    def accept_header(self, value):
+        self.__accept_header = value
+
+    @property
+    def java_enabled(self):
+        return self.__java_enabled
+
+    @java_enabled.setter
+    def java_enabled(self, value):
+        self.__java_enabled = value
+
+    @property
+    def java_script_enabled(self):
+        return self.__java_script_enabled
+
+    @java_script_enabled.setter
+    def java_script_enabled(self, value):
+        self.__java_script_enabled = value
+
+    @property
+    def language(self):
+        return self.__language
+
+    @language.setter
+    def language(self, value):
+        self.__language = value
+
+    @property
+    def user_agent(self):
+        return self.__user_agent
+
+    @user_agent.setter
+    def user_agent(self, value):
+        self.__user_agent = value
+
+    def to_ams_dict(self):
+        params = dict()
+        if hasattr(self, "accept_header") and self.accept_header:
+            params['acceptHeader'] = self.accept_header
+
+        if hasattr(self, "java_enabled") and self.java_enabled:
+            params['javaEnabled'] = self.java_enabled
+
+        if hasattr(self, "java_script_enabled") and self.java_script_enabled:
+            params['javaScriptEnabled'] = self.java_script_enabled
+
+        if hasattr(self, "language") and self.language:
+            params['language'] = self.language
+
+        if hasattr(self, "user_agent") and self.user_agent:
+            params['userAgent'] = self.user_agent
+        return params

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

@@ -3,7 +3,6 @@
 
 
 class BusinessType(object):
-
     HOTEL = "1"
     AIR_FLIGHT = "2"
     STUDAY_ABROAD = "3"

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

@@ -0,0 +1,9 @@
+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/capture_mode.py

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