fix bug
Showing
3 changed files
with
18 additions
and
10 deletions
... | @@ -62,8 +62,16 @@ class CustomDate(fields.Date): | ... | @@ -62,8 +62,16 @@ class CustomDate(fields.Date): |
62 | 62 | ||
63 | class CustomDecimal(fields.Decimal): | 63 | class CustomDecimal(fields.Decimal): |
64 | 64 | ||
65 | def __init__(self, places_2=False, *args, **kwargs): | ||
66 | self.places_2 = places_2 | ||
67 | super().__init__(*args, **kwargs) | ||
68 | |||
65 | def _deserialize(self, value, attr, data, **kwargs): | 69 | def _deserialize(self, value, attr, data, **kwargs): |
66 | return self._to_string(self._validated(value)) | 70 | if self.places_2: |
71 | return format(self._validated(value), ".2f") | ||
72 | else: | ||
73 | return format(self._validated(value), "f") | ||
74 | # return self._to_string(self._validated(value)) | ||
67 | 75 | ||
68 | 76 | ||
69 | # restframework将request.body封装至request.data, webargs从request.data中获取参数 | 77 | # restframework将request.body封装至request.data, webargs从request.data中获取参数 |
... | @@ -109,7 +117,7 @@ se_associated_args = { | ... | @@ -109,7 +117,7 @@ se_associated_args = { |
109 | 117 | ||
110 | se_payment_args = { | 118 | se_payment_args = { |
111 | 'term': fields.Int(required=True), | 119 | 'term': fields.Int(required=True), |
112 | 'amount': CustomDecimal(required=True) | 120 | 'amount': CustomDecimal(required=True, places_2=True) |
113 | } | 121 | } |
114 | 122 | ||
115 | se_bank_args = { | 123 | se_bank_args = { | ... | ... |
... | @@ -254,7 +254,7 @@ def pre_compare_license_id(license_en, id_res_list, field_list, applicant_type): | ... | @@ -254,7 +254,7 @@ def pre_compare_license_id(license_en, id_res_list, field_list, applicant_type): |
254 | 254 | ||
255 | # 身份证、居住证 过期期限特殊处理 | 255 | # 身份证、居住证 过期期限特殊处理 |
256 | expiry_dates = set() | 256 | expiry_dates = set() |
257 | key = compare_logic.get('idExpiryDate')[0] | 257 | key = compare_logic.get(consts.ID_FIELDS[2])[0] |
258 | for ocr_res in ocr_res_list: | 258 | for ocr_res in ocr_res_list: |
259 | if key in ocr_res: | 259 | if key in ocr_res: |
260 | expiry_dates.add(ocr_res[key]) | 260 | expiry_dates.add(ocr_res[key]) |
... | @@ -280,7 +280,7 @@ def pre_compare_license_id(license_en, id_res_list, field_list, applicant_type): | ... | @@ -280,7 +280,7 @@ def pre_compare_license_id(license_en, id_res_list, field_list, applicant_type): |
280 | 280 | ||
281 | # 过期期限特殊处理 | 281 | # 过期期限特殊处理 |
282 | # N, N1, N2, Y | 282 | # N, N1, N2, Y |
283 | if name == 'idExpiryDate' and result == consts.RESULT_N: # 遍历所有背面过期时间 | 283 | if name == consts.ID_FIELDS[2] and result == consts.RESULT_N: # 遍历所有背面过期时间 |
284 | if len(expiry_dates) == 0: | 284 | if len(expiry_dates) == 0: |
285 | result = consts.RESULT_N1 | 285 | result = consts.RESULT_N1 |
286 | ocr_str = empty_str | 286 | ocr_str = empty_str |
... | @@ -302,7 +302,7 @@ def pre_compare_license_id(license_en, id_res_list, field_list, applicant_type): | ... | @@ -302,7 +302,7 @@ def pre_compare_license_id(license_en, id_res_list, field_list, applicant_type): |
302 | result = consts.RESULT_Y | 302 | result = consts.RESULT_Y |
303 | 303 | ||
304 | if ca_or_se_idx == 0: | 304 | if ca_or_se_idx == 0: |
305 | if name == 'idExpiryDate': | 305 | if name == consts.ID_FIELDS[2]: |
306 | if result == consts.RESULT_N or result == consts.RESULT_N1: | 306 | if result == consts.RESULT_N or result == consts.RESULT_N1: |
307 | break | 307 | break |
308 | elif result == consts.RESULT_N: | 308 | elif result == consts.RESULT_N: |
... | @@ -316,7 +316,7 @@ def pre_compare_license_id(license_en, id_res_list, field_list, applicant_type): | ... | @@ -316,7 +316,7 @@ def pre_compare_license_id(license_en, id_res_list, field_list, applicant_type): |
316 | if isinstance(value, list): | 316 | if isinstance(value, list): |
317 | value = json.dumps(value, ensure_ascii=False) | 317 | value = json.dumps(value, ensure_ascii=False) |
318 | 318 | ||
319 | comments = consts.ID_DATE_MAP[result] if name == 'idExpiryDate' else compare_logic[name][3] | 319 | comments = consts.ID_DATE_MAP[result] if name == consts.ID_FIELDS[2] else compare_logic[name][3] |
320 | result_field_list.append((value, ocr_str, result, '{0}{1}'.format(applicant_type, comments))) | 320 | result_field_list.append((value, ocr_str, result, '{0}{1}'.format(applicant_type, comments))) |
321 | 321 | ||
322 | if not is_find: | 322 | if not is_find: | ... | ... |
... | @@ -111,10 +111,10 @@ HT_COMPARE_LOGIC = { | ... | @@ -111,10 +111,10 @@ HT_COMPARE_LOGIC = { |
111 | AFC_CON_FIELDS[8]: ('ASP项目详情-重要条款', 'se_asp_compare', {}, '合同(重要条款)ASP名称或者金额与系统不一致'), | 111 | AFC_CON_FIELDS[8]: ('ASP项目详情-重要条款', 'se_asp_compare', {}, '合同(重要条款)ASP名称或者金额与系统不一致'), |
112 | AFC_CON_FIELDS[9]: ('ASP项目详情', 'se_asp_compare', {}, '合同ASP名称或者金额与系统不一致'), | 112 | AFC_CON_FIELDS[9]: ('ASP项目详情', 'se_asp_compare', {}, '合同ASP名称或者金额与系统不一致'), |
113 | 113 | ||
114 | '主借人日期': ('主借人日期', 'se_have_compare', {}, '合同主借款人签字日期无'), | 114 | AFC_HT_DATE_FIELDS[0]: ('主借人日期', 'se_have_compare', {}, '合同主借款人签字日期无'), |
115 | '共借人日期': ('共借人日期', 'se_have_compare', {}, '合同共借人签字日期无'), | 115 | AFC_HT_DATE_FIELDS[1]: ('共借人日期', 'se_have_compare', {}, '合同共借人签字日期无'), |
116 | '保证人日期1': ('保证人日期1', 'se_have_compare', {}, '合同担保人1签字日期无'), | 116 | AFC_HT_DATE_FIELDS[2]: ('保证人日期1', 'se_have_compare', {}, '合同担保人1签字日期无'), |
117 | '保证人日期2': ('保证人日期2', 'se_have_compare', {}, '合同担保人2签字日期无'), | 117 | AFC_HT_DATE_FIELDS[3]: ('保证人日期2', 'se_have_compare', {}, '合同担保人2签字日期无'), |
118 | } | 118 | } |
119 | 119 | ||
120 | ID_COMPARE_LOGIC = { | 120 | ID_COMPARE_LOGIC = { | ... | ... |
-
Please register or sign in to post a comment