Merge pull request #14 from alipay/feature-add-fields-p2

Feature add fields p2

Author: ScottWryyyyy

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 
 
+## 1.3.3 - 2024-10-17
+* [#14](https://github.com/alipay/global-open-sdk-python/pull/14)  update-p2
+   * add MARKETPLACE_demo
+   * add MARKETPLACE
+   * add vaulting
+   * add Dispute
+   * add risk
+   * and add example
+   * add Notify
+
 ## 1.3.2 - 2024-09-04
 * [#13](https://github.com/alipay/global-open-sdk-python/pull/13)  add:ScopeType add TAOBAO_REBIND
    * Add TAOBAO_REBIND

README.md

@@ -9,11 +9,10 @@ Copyright：Ant financial services group
     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"
 
     alipay_pay_request.product_code = ProductCodeType.AGREEMENT_PAYMENT
-    alipay_pay_request.payment_notify_url = "https://www.merchant.com/notify"
-    alipay_pay_request.payment_redirect_url = "https://www.merchant.com?param1=sl"
+    alipay_pay_request.payment_notify_url = "https://www.yourNotifyUrl.com"
+    alipay_pay_request.payment_redirect_url = "https://www.yourRedirectUrl.com"
     alipay_pay_request.payment_request_id = "pay_python_test"
 
     payment_method = PaymentMethod()

com/alipay/ams/api/default_alipay_client.py

@@ -13,6 +13,7 @@ def __init__(self, gateway_url, client_id, merchant_private_key, alipay_public_k
         self.__client_id = client_id
         self.__merchant_private_key = merchant_private_key
         self.__alipay_public_key = alipay_public_key
+        self.__is_sandbox_mode = client_id.startswith("SANDBOX_")
 
     """
     内部方法，生成请求签名
@@ -65,6 +66,8 @@ def execute(self, request):
             raise AlipayApiException('invalid path')
 
         client_id = self.__client_id
+        self.__is_sandbox_mode = client_id.startswith("SANDBOX_")
+        self.adjust_sandbox_url(request)
         http_method = request.http_method.value
         path = request.path
         req_time = get_cur_iso8601_time()
@@ -102,3 +105,10 @@ def execute(self, request):
             raise AlipayApiException("response signature verify failed.")
 
         return rsp_body
+
+    def adjust_sandbox_url(self, request):
+        if self.__is_sandbox_mode:
+            origin_path = request.path
+            new_path = origin_path.replace('/ams/api', '/ams/sandbox/api', 1)
+            request.path = new_path
+

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

@@ -0,0 +1,49 @@
+import json
+
+from com.alipay.ams.api.model.amount import Amount
+
+
+class AccountBalance:
+    def __init__(self):
+        self.__account_balance = None
+        self.__currency = None
+        self.__available_balance = None #type: Amount
+        self.__frozen_balance = None #type: Amount
+        self.__total_balance = None #type: Amount
+
+    @property
+    def account_balance(self):
+        return self.__account_balance
+    @property
+    def currency(self):
+        return self.__currency
+
+    @property
+    def available_balance(self):
+        return self.__available_balance
+
+    @property
+    def frozen_balance(self):
+        return self.__frozen_balance
+
+    @property
+    def total_balance(self):
+        return self.__total_balance
+
+    def parse_rsp_body(self, response_body):
+        if type(response_body) == str:
+            response_body = json.loads(response_body)
+
+        if 'accountBalance' in response_body:
+            self.__account_balance = response_body['accountBalance']
+        if 'currency' in response_body:
+            self.__currency = response_body['currency']
+        if 'availableBalance' in response_body:
+            self.__available_balance = Amount()
+            self.__available_balance.parse_rsp_body(response_body['availableBalance'])
+        if 'frozenBalance' in response_body:
+            self.__frozen_balance = Amount()
+            self.__frozen_balance.parse_rsp_body(response_body['frozenBalance'])
+        if 'totalBalance' in response_body:
+            self.__total_balance = Amount()
+            self.__total_balance.parse_rsp_body(response_body['totalBalance'])

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

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

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

@@ -0,0 +1,11 @@
+
+from enum import Enum, unique
+
+
+@unique
+class AccountType(Enum):
+    CHECKING = "CHECKING"
+    FIXED_DEPOSIT = "FIXED_DEPOSIT"
+
+    def to_ams_dict(self):
+        return self.name

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

@@ -36,3 +36,4 @@ def parse_rsp_body(self, amount_body):
 
         if 'value' in amount_body:
             self.__value = amount_body['value']
+

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

@@ -0,0 +1,55 @@
+from enum import Enum
+
+class AntomPathConstants(Enum):
+    """
+    Ant Group
+    Copyright (c) 2004-2024 All Rights Reserved.
+    """
+    AUTH_CONSULT_PATH = "/ams/api/v1/authorizations/consult"
+    AUTH_APPLY_TOKEN_PATH = "/ams/api/v1/authorizations/applyToken"
+    AUTH_REVOKE_PATH = "/ams/api/v1/authorizations/revoke"
+    AUTH_QUERY_PATH = "/ams/api/v1/authorizations/query"
+
+    CREATE_VAULTING_SESSION_PATH = "/ams/api/v1/vaults/createVaultingSession"
+    VAULT_PAYMENT_METHOD_PATH = "/ams/api/v1/vaults/vaultPaymentMethod"
+    INQUIRE_VAULTING_PATH = "/ams/api/v1/vaults/inquireVaulting"
+
+    CONSULT_PAYMENT_PATH = "/ams/api/v1/payments/consult"
+    PAYMENT_PATH = "/ams/api/v1/payments/pay"
+    CREATE_SESSION_PATH = "/ams/api/v1/payments/createPaymentSession"
+    CAPTURE_PATH = "/ams/api/v1/payments/capture"
+    INQUIRY_PAYMENT_PATH = "/ams/api/v1/payments/inquiryPayment"
+    CANCEL_PATH = "/ams/api/v1/payments/cancel"
+    SYNC_ARREAR_PATH = "/ams/api/v1/payments/syncArrear"
+    CREATE_DEVICE_CERTIFICATE_PATH = "/ams/api/v1/payments/createDeviceCertificate"
+
+    SUBSCRIPTION_CREATE_PATH = "/ams/api/v1/subscriptions/create"
+    SUBSCRIPTION_CHANGE_PATH = "/ams/api/v1/subscriptions/change"
+    SUBSCRIPTION_CANCEL_PATH = "/ams/api/v1/subscriptions/cancel"
+
+    ACCEPT_DISPUTE_PATH = "/ams/api/v1/payments/acceptDispute"
+    SUPPLY_DEFENCE_DOC_PATH = "/ams/api/v1/payments/supplyDefenseDocument"
+    DOWNLOAD_DISPUTE_EVIDENCE_PATH = "/ams/api/v1/payments/downloadDisputeEvidence"
+
+    REFUND_PATH = "/ams/api/v1/payments/refund"
+    INQUIRY_REFUND_PATH = "/ams/api/v1/payments/inquiryRefund"
+
+    DECLARE_PATH = "/ams/api/v1/customs/declare"
+    INQUIRY_DECLARE_PATH = "/ams/api/v1/customs/inquiryDeclarationRequests"
+
+    MARKETPLACE_SUBMITATTACHMENT_PATH = "/ams/api/open/openapiv2_file/v1/business/attachment/submitAttachment"
+    MARKETPLACE_REGISTER_PATH = "/ams/api/v1/merchants/register"
+    MARKETPLACE_SETTLEMENTINFO_UPDATE_PATH = "/ams/api/v1/merchants/settlementInfo/update"
+    MARKETPLACE_INQUIREBALANCE_PATH = "/ams/api/v1/accounts/inquireBalance"
+    MARKETPLACE_SETTLE_PATH = "/ams/api/v1/payments/settle"
+    MARKETPLACE_CREATEPAYOUT_PATH = "/ams/api/v1/funds/createPayout"
+    MARKETPLACE_CREATETRANSFER_PATH = "/ams/api/v1/funds/createTransfer"
+
+    RISK_DECIDE_PATH = "/ams/api/v1/risk/payments/decide"
+    RISK_REPORT_PATH = "/ams/api/v1/risk/payments/reportRisk"
+    RISK_SEND_PAYMENT_RESULT_PATH = "/ams/api/v1/risk/payments/sendPaymentResult"
+    RISK_SEND_REFUND_RESULT_PATH = "/ams/api/v1/risk/payments/sendRefundResult"
+
+    MERCHANTS_INQUIRY_REGISTRATION_PATH  ="/ams/api/v1/merchants/inquiryRegistrationInfo"
+    MERCHANTS_REGISTRATION_PATH = "/ams/api/v1/merchants/registration"
+    MERCHANTS_INQUIRY_REGISTRATION_STATUS_PATH = "/ams/api/v1/merchants/inquiryRegistrationStatus"

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

@@ -0,0 +1,15 @@
+
+from enum import Enum, unique
+
+
+@unique
+class AssociationType(Enum):
+    LEGAL_REPRESENTATIVE = "LEGAL_REPRESENTATIVE"
+    UBO = "UBO"
+    CONTACT = "CONTACT"
+    DIRECTOR = "DIRECTOR"
+    AUTHORIZER = "AUTHORIZER"
+    BOARD_MEMBER = "BOARD_MEMBER"
+
+    def to_ams_dict(self):
+        return self.name

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

@@ -3,6 +3,7 @@ def __init__(self):
         self.__attachment_type = None
         self.__file = None
         self.__attachment_name = None
+        self.__file_key = None
 
     @property
     def attachment_type(self):
@@ -28,6 +29,14 @@ def attachment_name(self):
     def attachment_name(self, value):
         self.__attachment_name = value
 
+    @property
+    def file_key(self):
+        return self.__file_key
+
+    @file_key.setter
+    def file_key(self, value):
+        self.__file_key = value
+
     def to_ams_dict(self):
         params = dict()
         if hasattr(self, "attachment_type") and self.attachment_type:
@@ -39,4 +48,7 @@ def to_ams_dict(self):
         if hasattr(self, "attachment_name") and self.attachment_name:
             params['attachmentName'] = self.attachment_name
 
+        if hasattr(self, "file_key") and self.file_key:
+            params['fileKey'] = self.file_key
+
         return params