Skip to content

Commit dc0d305

Browse files
authored
Merge pull request #3 from alipay/add_field_20220523
add field
2 parents 408d19f + b556659 commit dc0d305

File tree

6 files changed

+103
-0
lines changed

6 files changed

+103
-0
lines changed

com/alipay/ams/api/request/auth/alipay_auth_apply_token_request.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,15 @@ def __init__(self):
1414
self.__auth_code = None
1515
self.__refresh_token = None
1616
self.__extend_info = None
17+
self.__merchant_region = None
18+
19+
@property
20+
def merchant_region(self):
21+
return self.__merchant_region
22+
23+
@merchant_region.setter
24+
def merchant_region(self, value):
25+
self.__merchant_region = value
1726

1827
@property
1928
def grant_type(self):
@@ -71,5 +80,7 @@ def __to_ams_dict(self):
7180
params['refreshToken'] = self.refresh_token
7281
if hasattr(self, "extend_info") and self.extend_info:
7382
params['extendInfo'] = self.extend_info
83+
if hasattr(self, "merchant_region") and self.merchant_region:
84+
params['merchantRegion'] = self.merchant_region
7485
return params
7586

com/alipay/ams/api/request/auth/alipay_auth_consult_request.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ def __init__(self):
1919
self.__os_type = None
2020
self.__os_version = None
2121
self.__extend_info = None
22+
self.__merchant_region = None
23+
24+
@property
25+
def merchant_region(self):
26+
return self.__merchant_region
27+
28+
@merchant_region.setter
29+
def merchant_region(self, value):
30+
self.__merchant_region = value
2231

2332
@property
2433
def customer_belongs_to(self):
@@ -117,4 +126,6 @@ def __to_ams_dict(self):
117126
params['osVersion'] = self.os_version
118127
if hasattr(self, "extendInfo") and self.extend_info:
119128
params['extendInfo'] = self.extend_info
129+
if hasattr(self, "merchant_region") and self.merchant_region:
130+
params['merchantRegion'] = self.merchant_region
120131
return params

com/alipay/ams/api/request/pay/alipay_pay_request.py

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,24 @@ def __init__(self):
2525
self.__settlement_strategy = None
2626
self.__extend_info = None
2727
self.__env = None
28+
self.__merchant_region = None
29+
self.__app_id = None
30+
31+
@property
32+
def merchant_region(self):
33+
return self.__merchant_region
34+
35+
@merchant_region.setter
36+
def merchant_region(self, value):
37+
self.__merchant_region = value
38+
39+
@property
40+
def app_id(self):
41+
return self.__app_id
42+
43+
@app_id.setter
44+
def app_id(self, value):
45+
self.__app_id = value
2846

2947
@property
3048
def product_code(self):
@@ -197,4 +215,10 @@ def __to_ams_dict(self):
197215
if hasattr(self, "env") and self.env:
198216
params['env'] = self.env
199217

218+
if hasattr(self, "merchant_region") and self.merchant_region:
219+
params['merchantRegion'] = self.merchant_region
220+
221+
if hasattr(self, "app_id") and self.app_id:
222+
params['appId'] = self.app_id
223+
200224
return params

com/alipay/ams/api/response/merchant/alipay_merchant_registration_response.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,16 @@ class AlipayMerchantRegistrationResponse(AlipayResponse):
55

66
def __init__(self, rsp_body):
77
super(AlipayMerchantRegistrationResponse, self).__init__()
8+
self.__pass_through_info = None
89
self.__parse_rsp_body(rsp_body)
910

11+
@property
12+
def pass_through_info(self):
13+
return self.__pass_through_info
14+
1015
def __parse_rsp_body(self, rsp_body):
1116
response = super(AlipayMerchantRegistrationResponse, self).parse_rsp_body(rsp_body)
17+
18+
if 'passThroughInfo' in response:
19+
pass_through_info = response['passThroughInfo']
20+
self.__pass_through_info = pass_through_info

com/alipay/ams/api/response/pay/alipay_pay_query_response.py

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,23 @@ def __init__(self, rsp_body):
3131
self.__redirect_action_form = None
3232
self.__extend_info = None
3333
self.__transactions = None
34+
self.__customs_declaration_amount = None
35+
self.__gross_settlement_amount = None
36+
self.__settlement_quote = None
3437
self.__parse_rsp_body(rsp_body)
3538

39+
@property
40+
def customs_declaration_amount(self):
41+
return self.__customs_declaration_amount
42+
43+
@property
44+
def gross_settlement_amount(self):
45+
return self.__gross_settlement_amount
46+
47+
@property
48+
def settlement_quote(self):
49+
return self.__settlement_quote
50+
3651
@property
3752
def payment_status(self):
3853
return self.__payment_status
@@ -176,3 +191,18 @@ def __parse_rsp_body(self, rsp_body):
176191
transaction.parse_rsp_body(transaction_body)
177192
transactions.append(transaction)
178193
self.__transactions = transactions
194+
195+
if 'customsDeclarationAmount' in response:
196+
customs_declaration_amount = Amount()
197+
customs_declaration_amount.parse_rsp_body(response['customsDeclarationAmount'])
198+
self.__customs_declaration_amount = customs_declaration_amount
199+
200+
if 'grossSettlementAmount' in response:
201+
gross_settlement_amount = Amount()
202+
gross_settlement_amount.parse_rsp_body(response['grossSettlementAmount'])
203+
self.__gross_settlement_amount = gross_settlement_amount
204+
205+
if 'settlementQuote' in response:
206+
settlement_quote = Quote()
207+
settlement_quote.parse_rsp_body(response['settlementQuote'])
208+
self.__settlement_quote = settlement_quote

com/alipay/ams/api/response/pay/alipay_pay_response.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,18 @@ def __init__(self, rsp_body):
2929
self.__redirect_action_form = None
3030
self.__order_code_form = None
3131
self.__extend_info = None
32+
self.__gross_settlement_amount = None
33+
self.__settlement_quote = None
3234
self.__parse_rsp_body(rsp_body)
3335

36+
@property
37+
def gross_settlement_amount(self):
38+
return self.__gross_settlement_amount
39+
40+
@property
41+
def settlement_quote(self):
42+
return self.__settlement_quote
43+
3444
@property
3545
def payment_request_id(self):
3646
return self.__payment_request_id
@@ -137,3 +147,11 @@ def __parse_rsp_body(self, rsp_body):
137147
self.__order_code_form = order_code_form
138148
if 'extendInfo' in response:
139149
self.__extend_info = response['extendInfo']
150+
if 'grossSettlementAmount' in response:
151+
gross_settlement_amount = Amount()
152+
gross_settlement_amount.parse_rsp_body(response['grossSettlementAmount'])
153+
self.__gross_settlement_amount = gross_settlement_amount
154+
if 'settlementQuote' in response:
155+
settlement_quote = Quote()
156+
settlement_quote.parse_rsp_body(response['settlementQuote'])
157+
self.__settlement_quote = settlement_quote

0 commit comments

Comments
 (0)