Merge branch 'feature/CHINARPA-5015' into feature/uat-tmp
Showing
1 changed file
with
17 additions
and
13 deletions
... | @@ -1207,6 +1207,8 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d | ... | @@ -1207,6 +1207,8 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d |
1207 | compare_info['bankInfo'] = bank_info | 1207 | compare_info['bankInfo'] = bank_info |
1208 | 1208 | ||
1209 | # 银行流水 -------------------------------------------------------------------- | 1209 | # 银行流水 -------------------------------------------------------------------- |
1210 | #增加 allow_bs_type 默认值,防止不需要比对流水的申请报错 | ||
1211 | allow_bs_type = '全部' | ||
1210 | if cms_info.get('autoApprovedDetails', {}).get('aaType', '') in ['CAA1', 'CAA2'] and \ | 1212 | if cms_info.get('autoApprovedDetails', {}).get('aaType', '') in ['CAA1', 'CAA2'] and \ |
1211 | '无需提供银行流水' not in cms_info.get('autoApprovedDetails', {}).get('PolicyComments', ''): | 1213 | '无需提供银行流水' not in cms_info.get('autoApprovedDetails', {}).get('PolicyComments', ''): |
1212 | date_timedelta = 60 if auto else 90 | 1214 | date_timedelta = 60 if auto else 90 |
... | @@ -1224,9 +1226,9 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d | ... | @@ -1224,9 +1226,9 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d |
1224 | ] | 1226 | ] |
1225 | 1227 | ||
1226 | #在比对逻辑中添加字段 | 1228 | #在比对逻辑中添加字段 |
1227 | if '不接受支付宝/微信' in cms_info.get('autoApprovedDetails', {}).get('PolicyComments', ''): | 1229 | if '仅接受银行流水' in cms_info.get('autoApprovedDetails', {}).get('PolicyComments', ''): |
1228 | #bs_field_input.append((consts.SE_BS_FIELD[9], '不接受支付宝/微信')) | 1230 | #bs_field_input.append((consts.SE_BS_FIELD[9], '仅接受银行流水')) |
1229 | allow_bs_type = '不接受支付宝/微信' | 1231 | allow_bs_type = '仅接受银行流水' |
1230 | else: | 1232 | else: |
1231 | #bs_field_input.append((consts.SE_BS_FIELD[9], '全部')) | 1233 | #bs_field_input.append((consts.SE_BS_FIELD[9], '全部')) |
1232 | allow_bs_type = '全部' | 1234 | allow_bs_type = '全部' |
... | @@ -1875,6 +1877,8 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect | ... | @@ -1875,6 +1877,8 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect |
1875 | compare_info['bankInfo'] = bank_info | 1877 | compare_info['bankInfo'] = bank_info |
1876 | 1878 | ||
1877 | # 银行流水 -------------------------------------------------------------------- | 1879 | # 银行流水 -------------------------------------------------------------------- |
1880 | #增加 allow_bs_type 默认值,防止不需要比对流水的申请报错 | ||
1881 | allow_bs_type = '全部' | ||
1878 | if cms_info.get('autoApprovedDetails', {}).get('aaType', '') in ['CAA1', 'CAA2'] and \ | 1882 | if cms_info.get('autoApprovedDetails', {}).get('aaType', '') in ['CAA1', 'CAA2'] and \ |
1879 | '无需提供银行流水' not in cms_info.get('autoApprovedDetails', {}).get('PolicyComments', ''): | 1883 | '无需提供银行流水' not in cms_info.get('autoApprovedDetails', {}).get('PolicyComments', ''): |
1880 | date_timedelta = 60 if auto else 90 | 1884 | date_timedelta = 60 if auto else 90 |
... | @@ -1892,9 +1896,9 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect | ... | @@ -1892,9 +1896,9 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect |
1892 | ] | 1896 | ] |
1893 | 1897 | ||
1894 | #在比对逻辑中添加字段 | 1898 | #在比对逻辑中添加字段 |
1895 | if '不接受支付宝/微信' in cms_info.get('autoApprovedDetails', {}).get('PolicyComments', ''): | 1899 | if '仅接受银行流水' in cms_info.get('autoApprovedDetails', {}).get('PolicyComments', ''): |
1896 | #bs_field_input.append((consts.SE_BS_FIELD[9], '不接受支付宝/微信')) | 1900 | #bs_field_input.append((consts.SE_BS_FIELD[9], '仅接受银行流水')) |
1897 | allow_bs_type = '不接受支付宝/微信' | 1901 | allow_bs_type = '仅接受银行流水' |
1898 | else: | 1902 | else: |
1899 | #bs_field_input.append((consts.SE_BS_FIELD[9], '全部')) | 1903 | #bs_field_input.append((consts.SE_BS_FIELD[9], '全部')) |
1900 | allow_bs_type = '全部' | 1904 | allow_bs_type = '全部' |
... | @@ -2247,8 +2251,8 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type, allow_ | ... | @@ -2247,8 +2251,8 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type, allow_ |
2247 | verify_bool = ocr_res.get('verify', False) | 2251 | verify_bool = ocr_res.get('verify', False) |
2248 | e_bank = ocr_res.get('e_bank', False) | 2252 | e_bank = ocr_res.get('e_bank', False) |
2249 | bankStatement_type = ocr_res.get('bankStatement_type', '') | 2253 | bankStatement_type = ocr_res.get('bankStatement_type', '') |
2250 | # 如果是高风险经销商,cms信息中包含‘不接受支付宝/微信’,但是识别出的流水是支付宝/微信,直接跳过这个文件,就当不存在 | 2254 | # 如果是高风险经销商,cms信息中包含‘仅接受银行流水’,但是识别出的流水是支付宝/微信,直接跳过这个文件,就当不存在 |
2251 | if allow_bs_type == '不接受支付宝/微信' and bankStatement_type in ['12', '13', '48']: | 2255 | if allow_bs_type == '仅接受银行流水' and bankStatement_type in ['12', '13', '48']: |
2252 | continue | 2256 | continue |
2253 | all_zhifubao_weixin = False | 2257 | all_zhifubao_weixin = False |
2254 | #verify_list.append(verify_bool) | 2258 | #verify_list.append(verify_bool) |
... | @@ -2340,7 +2344,7 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type, allow_ | ... | @@ -2340,7 +2344,7 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type, allow_ |
2340 | # 核查点名称,cms传值,比对结果,ocr结果,图片路径,错误类型,错误描述 | 2344 | # 核查点名称,cms传值,比对结果,ocr结果,图片路径,错误类型,错误描述 |
2341 | result_field_list.append(('类型', allow_bs_type, consts.RESULT_N, '全部为支付宝/微信', empty_str, ErrorType.NF.value, '高风险经销商流水类型异常')) | 2345 | result_field_list.append(('类型', allow_bs_type, consts.RESULT_N, '全部为支付宝/微信', empty_str, ErrorType.NF.value, '高风险经销商流水类型异常')) |
2342 | else: | 2346 | else: |
2343 | result_field_list.append(('类型', allow_bs_type, consts.RESULT_Y, '包含支付宝/微信以外流水', empty_str, empty_error_type, '')) | 2347 | result_field_list.append(('类型', allow_bs_type, consts.RESULT_Y, '包含支持的流水类型', empty_str, empty_error_type, '')) |
2344 | 2348 | ||
2345 | # 担保人1 | 2349 | # 担保人1 |
2346 | dbr1_best_res = {} | 2350 | dbr1_best_res = {} |
... | @@ -2348,8 +2352,8 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type, allow_ | ... | @@ -2348,8 +2352,8 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type, allow_ |
2348 | max_correct_count = 0 | 2352 | max_correct_count = 0 |
2349 | for ocr_res in ocr_res_list: | 2353 | for ocr_res in ocr_res_list: |
2350 | bankStatement_type = ocr_res.get('bankStatement_type', '') | 2354 | bankStatement_type = ocr_res.get('bankStatement_type', '') |
2351 | # 如果是高风险经销商,cms信息中包含‘不接受支付宝/微信’,但是识别出的流水是支付宝/微信,直接跳过这个文件,就当不存在 | 2355 | # 如果是高风险经销商,cms信息中包含‘仅接受银行流水’,但是识别出的流水是支付宝/微信,直接跳过这个文件,就当不存在 |
2352 | if allow_bs_type == '不接受支付宝/微信' and bankStatement_type in ['12', '13', '48']: | 2356 | if allow_bs_type == '仅接受银行流水' and bankStatement_type in ['12', '13', '48']: |
2353 | continue | 2357 | continue |
2354 | 2358 | ||
2355 | correct_count = 0 | 2359 | correct_count = 0 |
... | @@ -2385,8 +2389,8 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type, allow_ | ... | @@ -2385,8 +2389,8 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type, allow_ |
2385 | max_correct_count = 0 | 2389 | max_correct_count = 0 |
2386 | for ocr_res in ocr_res_list: | 2390 | for ocr_res in ocr_res_list: |
2387 | bankStatement_type = ocr_res.get('bankStatement_type', '') | 2391 | bankStatement_type = ocr_res.get('bankStatement_type', '') |
2388 | # 如果是高风险经销商,cms信息中包含‘不接受支付宝/微信’,但是识别出的流水是支付宝/微信,直接跳过这个文件,就当不存在 | 2392 | # 如果是高风险经销商,cms信息中包含‘仅接受银行流水’,但是识别出的流水是支付宝/微信,直接跳过这个文件,就当不存在 |
2389 | if allow_bs_type == '不接受支付宝/微信' and bankStatement_type in ['12', '13', '48']: | 2393 | if allow_bs_type == '仅接受银行流水' and bankStatement_type in ['12', '13', '48']: |
2390 | continue | 2394 | continue |
2391 | correct_count = 0 | 2395 | correct_count = 0 |
2392 | dbr2_tmp_res_part = {} | 2396 | dbr2_tmp_res_part = {} | ... | ... |
-
Please register or sign in to post a comment