fix cr issues

Author: wangzunjiao

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

@@ -0,0 +1,24 @@
+from com.alipay.ams.api.model.china_extra_trans_info import ChinaExtraTransInfo
+
+
+class ExtendInfo(object):
+    def __init__(self):
+        self.__china_extra_trans_info = None #type:ChinaExtraTransInfo
+
+
+    @property
+    def china_extra_trans_info(self):
+        return self.__china_extra_trans_info
+
+
+    @china_extra_trans_info.setter
+    def china_extra_trans_info(self, value):
+        self.__china_extra_trans_info = value
+
+    def to_ams_dict(self):
+        params = dict()
+        if hasattr(self, "china_extra_trans_info") and self.china_extra_trans_info:
+            params['chinaExtraTransInfo'] = self.china_extra_trans_info
+
+        return params
+

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

@@ -8,7 +8,7 @@ class PromotionResult(object):
 
     def __init__(self):
         self.__promotion_type = None #type:PromotionType
-        self.__discount = None
+        self.__discount = None #type:Discount
 
 
     @property

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

@@ -13,6 +13,7 @@ def __init__(self):
         self.__method = None #type:MethodType
         self.__parameters = None
         self.__redirect_url = None
+        self.__action_form_type = None
 
     @property
     def method(self):
@@ -38,6 +39,14 @@ def redirect_url(self):
     def redirect_url(self, value):
         self.__redirect_url = value
 
+    @property
+    def action_form_type(self):
+        return self.__action_form_type
+
+    @action_form_type.setter
+    def action_form_type(self, value):
+        self.__action_form_type = value
+
     def parse_rsp_body(self, redirect_action_form_body):
         if type(redirect_action_form_body) == str:
             redirect_action_form_body = json.loads(redirect_action_form_body)
@@ -50,3 +59,6 @@ def parse_rsp_body(self, redirect_action_form_body):
 
         if 'redirectUrl' in redirect_action_form_body:
             self.__redirect_url = redirect_action_form_body['redirectUrl']
+
+        if 'actionFormType' in redirect_action_form_body:
+            self.__action_form_type = redirect_action_form_body['actionFormType']

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

@@ -0,0 +1,36 @@
+import json
+
+from com.alipay.ams.api.model.amount import Amount
+
+
+class RefundDetail(object):
+    def __init__(self):
+        self.__refund_amount = None #type:Amount
+        self.__refund_from = None #type:RefundFromType
+
+
+    @property
+    def refund_amount(self):
+         return self.__refund_amount
+
+    @refund_amount.setter
+    def refund_amount(self, value):
+         self.__refund_amount = value
+
+    @property
+    def refund_from(self):
+         return self.__refund_from
+
+    @refund_from.setter
+    def refund_from(self , value):
+         self.__refund_from = value
+
+
+    def parse_rsp_body(self, quote_body):
+        if type(quote_body) == str:
+            quote_body = json.loads(quote_body)
+        if 'refundAmount' in quote_body:
+            self.__refund_amount = Amount()
+            self.__refund_amount.parse_rsp_body(quote_body['refundAmount'])
+        if 'refundFrom' in quote_body:
+            self.__refund_from = quote_body['refundFrom']

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

@@ -0,0 +1,11 @@
+from enum import Enum, unique
+
+
+@unique
+class RefundFromType(Enum):
+    SELLER = "SELLER"
+    MARKETPLACE = "MARKETPLACE"
+    UNSETTLED_FUNDS = "UNSETTLED_FUNDS"
+
+    def to_ams_dict(self):
+        return self.name

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

@@ -38,6 +38,7 @@ def __init__(self, rsp_body):
         self.__acquirer_reference_no = None
         self.__payment_result_info = None #type: PaymentResultInfo
         self.__promotion_result = None #type: PromotionResult
+        self.__earliest_settlement_time = None
         self.__parse_rsp_body(rsp_body)
 
     @property
@@ -132,6 +133,10 @@ def payment_result_info(self):
     def promotion_result(self):
         return self.__promotion_result
 
+    @property
+    def earliest_settlement_time(self):
+        return self.__earliest_settlement_time
+
     def __parse_rsp_body(self, rsp_body):
         response = super(AlipayPayQueryResponse, self).parse_rsp_body(rsp_body)
 
@@ -234,4 +239,7 @@ def __parse_rsp_body(self, rsp_body):
         if 'promotionResult' in response:
             promotion_result = PromotionResult()
             promotion_result.parse_rsp_body(response['promotionResult'])
-            self.__promotion_result = promotion_result
+            self.__promotion_result = promotion_result
+
+        if 'earliestSettlementTime' in response:
+            self.__earliest_settlement_time = response['earliestSettlementTime']

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

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from com.alipay.ams.api.model.quote import Quote
+from com.alipay.ams.api.model.refund_detail import RefundDetail
 from com.alipay.ams.api.response.alipay_response import AlipayResponse
 from com.alipay.ams.api.model.amount import Amount
 
@@ -18,6 +19,8 @@ def __init__(self, rsp_body):
         self.__acquirer_reference_no = None
         self.__gross_settlement_amount = None #type: Amount
         self.__settlement_quote = None #type: Quote
+        self.__refund_details = None #type:list:RefundDetail
+        self.__refund_source_account_no = None
         self.__parse_rsp_body(rsp_body)
 
     @property
@@ -56,6 +59,14 @@ def gross_settlement_amount(self):
     def settlement_quote(self):
         return self.__settlement_quote
 
+    @property
+    def refund_details(self):
+        return self.__refund_details
+
+    @property
+    def refund_source_account_no(self):
+        return self.__refund_source_account_no
+
 
     def __parse_rsp_body(self, rsp_body):
         response = super(AlipayRefundResponse, self).parse_rsp_body(rsp_body)
@@ -87,4 +98,15 @@ def __parse_rsp_body(self, rsp_body):
         if 'settlementQuote' in response:
             settlement_quote = Quote()
             settlement_quote.parse_rsp_body(response['settlementQuote'])
-            self.__settlement_quote = settlement_quote
+            self.__settlement_quote = settlement_quote
+
+        if 'refundDetails' in response:
+            refund_details = []
+            for refund_detail in response['refundDetails']:
+                refund_detail_obj = RefundDetail()
+                refund_detail_obj.parse_rsp_body(refund_detail)
+                refund_details.append(refund_detail_obj)
+            self.__refund_details = refund_details
+
+        if 'refundSourceAccountNo' in response:
+            self.__refund_source_account_no = response['refundSourceAccountNo']