Skip to content

周伟奇 / bmw-ocr

Go to a project
Toggle navigation
Toggle navigation pinning
ce95c8f4 by 周伟奇
Options

che dai fen li

1 parent e6486884
Inline Side-by-side
Showing 3 changed files with 195 additions and 152 deletions
src/apps/doc/consts.py
...@@ -1571,55 +1571,55 @@ SE_HIL_CON_3_FIELD = ['合同编号-每页', '承租人姓名', '承租人证件 ...@@ -1571,55 +1571,55 @@ SE_HIL_CON_3_FIELD = ['合同编号-每页', '承租人姓名', '承租人证件
1571 1571
1572 1572
1573 ROLE_LIST = [ 1573 ROLE_LIST = [
1574 ('借款人签字及时间', 'Borrower', 0, 0, True, False), 1574 ('借款人签字及时间', '借款人签字及时间', 'Borrower', 0, 0, True, False),
1575 ('借款人姓名', 'Borrower', 0, 0, True, True), 1575 ('借款人姓名', '借款人姓名', 'Borrower', 0, 0, True, True),
1576 ('借款人证件号', 'Borrower', 0, 2, True, True), 1576 ('借款人证件号', '借款人证件号', 'Borrower', 0, 2, True, True),
1577 ('主借人签字', 'Borrower', 0, 0, True, False), 1577 ('主借人签字', '主借人签字', 'Borrower', 0, 0, True, False),
1578 ('主借人日期', 'Borrower', 0, '有', True, False), 1578 ('主借人日期', '主借人日期', 'Borrower', 0, '有', True, False),
1579 1579
1580 ('共借人姓名', 'Co-Borrower', 0, 0, False, True), 1580 ('共借人姓名', '共借人&抵押人姓名', 'Co-Borrower', 0, 0, False, True),
1581 ('共借人证件号', 'Co-Borrower', 0, 2, False, True), 1581 ('共借人证件号', '共借人&抵押人证件号', 'Co-Borrower', 0, 2, False, True),
1582 ('共借人签字', 'Co-Borrower', 0, 0, False, False), 1582 ('共借人签字', '共借人签字', 'Co-Borrower', 0, 0, False, False),
1583 ('共借人日期', 'Co-Borrower', 0, '有', False, False), 1583 ('共借人日期', '共借人日期', 'Co-Borrower', 0, '有', False, False),
1584 1584
1585 ('保证人姓名1', 'Guarantor', 0, 0, False, True), 1585 ('保证人姓名1', '保证人姓名1', 'Guarantor', 0, 0, False, True),
1586 ('保证人证件号1', 'Guarantor', 0, 2, False, True), 1586 ('保证人证件号1', '保证人证件号1', 'Guarantor', 0, 2, False, True),
1587 ('保证人签字1', 'Guarantor', 0, 0, False, False), 1587 ('保证人签字1', '保证人签字1', 'Guarantor', 0, 0, False, False),
1588 ('保证人日期1', 'Guarantor', 0, '有', False, False), 1588 ('保证人日期1', '保证人日期1', 'Guarantor', 0, '有', False, False),
1589 1589
1590 ('保证人姓名2', 'Guarantor', 1, 0, False, True), 1590 ('保证人姓名2', '保证人姓名2', 'Guarantor', 1, 0, False, True),
1591 ('保证人证件号2', 'Guarantor', 1, 2, False, True), 1591 ('保证人证件号2', '保证人证件号2', 'Guarantor', 1, 2, False, True),
1592 ('保证人签字2', 'Guarantor', 1, 0, False, False), 1592 ('保证人签字2', '保证人签字2', 'Guarantor', 1, 0, False, False),
1593 ('保证人日期2', 'Guarantor', 1, '有', False, False), 1593 ('保证人日期2', '保证人日期2', 'Guarantor', 1, '有', False, False),
1594 ] 1594 ]
1595 1595
1596 # key, app_type, id_idx, field_idx, is_force, e_write, 公户跳过 1596 # key, app_type, id_idx, field_idx, is_force, e_write, 公户跳过
1597 ROLE_LIST_2 = [ 1597 ROLE_LIST_2 = [
1598 ('抵押人', 'Borrower', 0, 0, True, True, False), 1598 ('抵押人', 'Borrower', 'Co-Borrower', 0, 0, True, True, False),
1599 ('抵押人证件号码', 'Borrower', 0, 2, True, True, False), 1599 ('抵押人证件号码', 'Borrower', 'Co-Borrower', 0, 2, True, True, False),
1600 ('抵押人签字', 'Borrower', 0, 0, True, False, False), 1600 ('抵押人签字', 'Borrower', 'Co-Borrower', 0, 0, True, False, False),
1601 1601
1602 ('抵押人配偶', 'Co-Borrower', 0, 0, False, True, True), 1602 ('抵押人配偶', 'Co-Borrower', 'Co-Borrower', 0, 0, False, True, True),
1603 ('抵押人配偶证件号码', 'Co-Borrower', 0, 2, False, True, True), 1603 ('抵押人配偶证件号码', 'Co-Borrower', 'Co-Borrower', 0, 2, False, True, True),
1604 ('抵押人配偶签字', 'Co-Borrower', 0, 0, False, False, True), 1604 ('抵押人配偶签字', 'Co-Borrower', 'Co-Borrower', 0, 0, False, False, True),
1605 ] 1605 ]
1606 1606
1607 ROLE_LIST_1 = [ 1607 ROLE_LIST_1 = [
1608 ('承租人姓名', 'Borrower', 0, 0, True, True), 1608 ('承租人姓名', '承租人姓名', 'Borrower', 0, 0, True, True),
1609 ('承租人证件号', 'Borrower', 0, 2, True, True), 1609 ('承租人证件号', '承租人证件号', 'Borrower', 0, 2, True, True),
1610 ('承租人签字', 'Borrower', 0, 0, True, False), 1610 ('承租人签字', '承租人签字', 'Borrower', 0, 0, True, False),
1611 1611
1612 ('共同承租人姓名', 'Co-Borrower', 0, 0, False, True), 1612 ('共同承租人姓名', '共同承租人&抵押人姓名', 'Co-Borrower', 0, 0, False, True),
1613 ('共同承租人证件号', 'Co-Borrower', 0, 2, False, True), 1613 ('共同承租人证件号', '共同承租人&抵押人证件号', 'Co-Borrower', 0, 2, False, True),
1614 ('共同承租人签字', 'Co-Borrower', 0, 0, False, False), 1614 ('共同承租人签字', '共同承租人签字', 'Co-Borrower', 0, 0, False, False),
1615 1615
1616 ('保证人姓名1', 'Guarantor', 0, 0, False, True), 1616 ('保证人姓名1', '保证人姓名1', 'Guarantor', 0, 0, False, True),
1617 ('保证人证件号1', 'Guarantor', 0, 2, False, True), 1617 ('保证人证件号1', '保证人证件号1', 'Guarantor', 0, 2, False, True),
1618 ('保证人签字1', 'Guarantor', 0, 0, False, False), 1618 ('保证人签字1', '保证人签字1', 'Guarantor', 0, 0, False, False),
1619 1619
1620 ('保证人姓名2', 'Guarantor', 1, 0, False, True), 1620 ('保证人姓名2', '保证人姓名2', 'Guarantor', 1, 0, False, True),
1621 ('保证人证件号2', 'Guarantor', 1, 2, False, True), 1621 ('保证人证件号2', '保证人证件号2', 'Guarantor', 1, 2, False, True),
1622 ('保证人签字2', 'Guarantor', 1, 0, False, False), 1622 ('保证人签字2', '保证人签字2', 'Guarantor', 1, 0, False, False),
1623 ] 1623 ]
1624 1624
1625 GZS_REASON_1 = '此申请有ASP产品，需人工核查' 1625 GZS_REASON_1 = '此申请有ASP产品，需人工核查'
...@@ -1797,8 +1797,8 @@ HMH_COMPARE_LOGIC = { ...@@ -1797,8 +1797,8 @@ HMH_COMPARE_LOGIC = {
1797 } 1797 }
1798 1798
1799 BD_COMPARE_LOGIC = { 1799 BD_COMPARE_LOGIC = {
1800 '被保险人姓名': ('被保险人姓名', 'se_name_compare', {}, '保单被保险人姓名与系统不一致'), 1800 '被保险人姓名': ('被保险人姓名', 'super_list_compare', {'method': 'name'}, '保单被保险人姓名与系统不一致'),
1801 '被保险人证件号码': ('被保险人证件号码', 'se_common_compare', {'is_bd_id': True}, '保单身份证号需人工核查'), 1801 '被保险人证件号码': ('被保险人证件号码', 'super_list_compare', {'method': 'common', 'is_bd_id': True}, '保单身份证号需人工核查'),
1802 '车架号': ('车架号', 'se_common_compare', {}, '保单车架号与系统不一致'), 1802 '车架号': ('车架号', 'se_common_compare', {}, '保单车架号与系统不一致'),
1803 '机动车损失保险金额': ('机动车损失保险金额', 'se_amount_lte_compare', {}, '保单车损险异常'), 1803 '机动车损失保险金额': ('机动车损失保险金额', 'se_amount_lte_compare', {}, '保单车损险异常'),
1804 '第三者责任保险金额': ('机动车第三者责任保险金额', 'se_amount_lte_compare', {}, '保单三者险异常'), 1804 '第三者责任保险金额': ('机动车第三者责任保险金额', 'se_amount_lte_compare', {}, '保单三者险异常'),
...@@ -1868,7 +1868,9 @@ HIL_CONTRACT_1_COMPARE_LOGIC = { ...@@ -1868,7 +1868,9 @@ HIL_CONTRACT_1_COMPARE_LOGIC = {
1868 '承租人签字': ('承租人签字', 'se_contain_compare', {}, '售后回租合同承租人签字与系统不一致'), 1868 '承租人签字': ('承租人签字', 'se_contain_compare', {}, '售后回租合同承租人签字与系统不一致'),
1869 1869
1870 '共同承租人姓名': ('共同承租人姓名', 'se_name_compare', {}, '售后回租合同共同承租人姓名与系统不一致'), 1870 '共同承租人姓名': ('共同承租人姓名', 'se_name_compare', {}, '售后回租合同共同承租人姓名与系统不一致'),
1871 '共同承租人&抵押人姓名': ('共同承租人姓名', 'se_name_compare', {}, '售后回租合同共同承租人&抵押人姓名与系统不一致'),
1871 '共同承租人证件号': ('共同承租人证件号', 'se_common_compare', {}, '售后回租合同共同承租人证件号与系统不一致'), 1872 '共同承租人证件号': ('共同承租人证件号', 'se_common_compare', {}, '售后回租合同共同承租人证件号与系统不一致'),
1873 '共同承租人&抵押人证件号': ('共同承租人证件号', 'se_common_compare', {}, '售后回租合同共同承租人&抵押人证件号与系统不一致'),
1872 '共同承租人签字': ('共同承租人签字', 'se_contain_compare', {}, '售后回租合同共同承租人签字与系统不一致'), 1874 '共同承租人签字': ('共同承租人签字', 'se_contain_compare', {}, '售后回租合同共同承租人签字与系统不一致'),
1873 1875
1874 '保证人姓名1': ('保证人姓名1', 'se_name_compare', {}, '售后回租合同保证人姓名1与系统不一致'), 1876 '保证人姓名1': ('保证人姓名1', 'se_name_compare', {}, '售后回租合同保证人姓名1与系统不一致'),
...@@ -1931,7 +1933,9 @@ HT_COMPARE_LOGIC = { ...@@ -1931,7 +1933,9 @@ HT_COMPARE_LOGIC = {
1931 '借款人姓名': ('借款人姓名', 'se_common_compare', {}, '主合同主借人姓名与系统不一致'), 1933 '借款人姓名': ('借款人姓名', 'se_common_compare', {}, '主合同主借人姓名与系统不一致'),
1932 '借款人证件号': ('借款人证件号', 'se_common_compare', {}, '主合同主借人证件号码与系统不一致'), 1934 '借款人证件号': ('借款人证件号', 'se_common_compare', {}, '主合同主借人证件号码与系统不一致'),
1933 '共借人姓名': ('共借人姓名', 'se_common_compare', {}, '主合同共借人姓名与系统不一致'), 1935 '共借人姓名': ('共借人姓名', 'se_common_compare', {}, '主合同共借人姓名与系统不一致'),
1936 '共借人&抵押人姓名': ('共借人姓名', 'se_common_compare', {}, '主合同共借人&抵押人姓名与系统不一致'),
1934 '共借人证件号': ('共借人证件号', 'se_common_compare', {}, '主合同共借人证件号码与系统不一致'), 1937 '共借人证件号': ('共借人证件号', 'se_common_compare', {}, '主合同共借人证件号码与系统不一致'),
1938 '共借人&抵押人证件号': ('共借人证件号', 'se_common_compare', {}, '主合同共借人&抵押人证件号与系统不一致'),
1935 '保证人姓名1': ('保证人姓名1', 'se_common_compare', {}, '主合同担保人1姓名与系统不一致'), 1939 '保证人姓名1': ('保证人姓名1', 'se_common_compare', {}, '主合同担保人1姓名与系统不一致'),
1936 '保证人证件号1': ('保证人证件号1', 'se_common_compare', {}, '主合同担保人1证件号码与系统不一致'), 1940 '保证人证件号1': ('保证人证件号1', 'se_common_compare', {}, '主合同担保人1证件号码与系统不一致'),
1937 '保证人姓名2': ('保证人姓名2', 'se_common_compare', {}, '主合同担保人2姓名与系统不一致'), 1941 '保证人姓名2': ('保证人姓名2', 'se_common_compare', {}, '主合同担保人2姓名与系统不一致'),
......
src/celery_compare/tasks.py
...@@ -884,18 +884,26 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -884,18 +884,26 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
884 dealer_name_list = cms_info.get('dealerName', '').split() 884 dealer_name_list = cms_info.get('dealerName', '').split()
885 dealer_name = '' if len(dealer_name_list) == 0 else dealer_name_list[-1] 885 dealer_name = '' if len(dealer_name_list) == 0 else dealer_name_list[-1]
886 886
887 # 个人信息证件--------------------------------------------------------------------------------------------------------- 887 # 个人信息证件------------------------------------------------------------------------------------------------------
888 is_cdfl = True # 车贷分离
888 # province = cms_info.get('province', '') 889 # province = cms_info.get('province', '')
889 for individual_info in cms_info.get('applicantInformation', []): 890 for individual_info in cms_info.get('applicantInformation', []):
890 all_id_num = [] 891 all_id_num = []
891 892
892 license_dict = {} 893 license_dict = {}
893 894
894 customer_name = individual_info.get('name', '') 895 customer_name = individual_info.get('name', '').strip()
895 legal_name = individual_info.get('legalRepName', '') 896 legal_name = individual_info.get('legalRepName', '')
896 # establishment_date = individual_info.get('establishmentDate', '') 897 establishment_date = individual_info.get('establishmentDate', '')
897 # date_of_birth = individual_info.get('dateOfBirth', '') 898 # date_of_birth = individual_info.get('dateOfBirth', '')
898 899
900 # 车贷分离判断
901 is_corporate = individual_info.get('customersubType', '') == 'Corporate'
902 if individual_info['applicantType'] == consts.APPLICANT_TYPE_ORDER[1] and not is_corporate:
903 is_cdfl = False
904 if individual_info['applicantType'] == consts.APPLICANT_TYPE_ORDER[0] and is_corporate:
905 is_cdfl = False
906
899 for id_info in individual_info.get('IDInformation', []): 907 for id_info in individual_info.get('IDInformation', []):
900 if id_info.get('idType') in consts.SE_CMS_FIRST_ID_FIELD_MAPPING: 908 if id_info.get('idType') in consts.SE_CMS_FIRST_ID_FIELD_MAPPING:
901 license_en, is_prc = consts.SE_CMS_FIRST_ID_FIELD_MAPPING[id_info['idType']] 909 license_en, is_prc = consts.SE_CMS_FIRST_ID_FIELD_MAPPING[id_info['idType']]
...@@ -903,10 +911,10 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -903,10 +911,10 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
903 id_num = decode_des(id_info.get('idNum', ''), des_key) 911 id_num = decode_des(id_info.get('idNum', ''), des_key)
904 field_input = [('customerName', customer_name), ('idNum', id_num), 912 field_input = [('customerName', customer_name), ('idNum', id_num),
905 ('idExpiryDate', id_info.get('idExpiryDate', ''))] 913 ('idExpiryDate', id_info.get('idExpiryDate', ''))]
906 if is_prc: 914 # if is_prc:
907 # field_input.append(('hukouProvince', province)) 915 # field_input.append(('hukouProvince', province))
908 # field_input.append(('真伪', consts.IC_RES_MAPPING.get(1))) 916 # field_input.append(('真伪', consts.IC_RES_MAPPING.get(1)))
909 license_dict[license_en] = field_input 917 license_dict[license_en] = field_input
910 all_id_num.append(id_num) 918 all_id_num.append(id_num)
911 # 营业执照 -------------------------------------------------------------------------------------------------- 919 # 营业执照 --------------------------------------------------------------------------------------------------
912 elif id_info.get('idType') in ['Unified Social Credit Code', 'Tax Number', 'Business License Number']: 920 elif id_info.get('idType') in ['Unified Social Credit Code', 'Tax Number', 'Business License Number']:
...@@ -919,13 +927,16 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -919,13 +927,16 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
919 # ('businessLicenseNo', id_num), 927 # ('businessLicenseNo', id_num),
920 # ('organizationCreditCode', id_num), 928 # ('organizationCreditCode', id_num),
921 # ('taxRegistrationCertificateNo', id_num), 929 # ('taxRegistrationCertificateNo', id_num),
922 # ('establishmentDate', establishment_date),
923 # ('businessLicenseDueDate', id_info.get('idExpiryDate', '')), 930 # ('businessLicenseDueDate', id_info.get('idExpiryDate', '')),
924 # ] 931 # ]
932
933 if is_corporate:
934 company_info_list.append((customer_name, id_num, legal_name))
935 # else:
936 # bl_field_input.append(('establishmentDate', establishment_date))
937
925 # license_dict[consts.BL_EN] = bl_field_input 938 # license_dict[consts.BL_EN] = bl_field_input
926 all_id_num.append(id_num) 939 all_id_num.append(id_num)
927 if individual_info.get('customersubType', '') == 'Corporate':
928 company_info_list.append((customer_name, id_num, legal_name))
929 940
930 # SME营业执照--------------------------------------------------------------------------------------------------- 941 # SME营业执照---------------------------------------------------------------------------------------------------
931 # if individual_info.get('customersubType', '').startswith('Self Employed'): 942 # if individual_info.get('customersubType', '').startswith('Self Employed'):
...@@ -945,16 +956,28 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -945,16 +956,28 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
945 956
946 compare_info['applicantInformation'] = individual_info_dict 957 compare_info['applicantInformation'] = individual_info_dict
947 958
948 main_name = main_num = hmh_name = hmh_id = '' 959 main_name = main_id_all = main_id = ''
949 for applicant_type in consts.APPLICANT_TYPE_ORDER: 960 for applicant_type in consts.APPLICANT_TYPE_ORDER:
950 if applicant_type in main_role_info: 961 if applicant_type in main_role_info:
951 # main_name, main_num, _ = main_role_info[applicant_type][0] 962 main_name, main_id_all, main_id = main_role_info[applicant_type][0]
952 hmh_name, _, hmh_id = main_role_info[applicant_type][0] 963 # hmh_name, _, hmh_id = main_role_info[applicant_type][0]
953 break 964 break
954 965
966 co_name = co_id = bo_name = bo_id = ''
967 if is_cdfl:
968 co_name, _, co_id = main_role_info[consts.APPLICANT_TYPE_ORDER[1]][0]
969 bo_name, _, bo_id = main_role_info[consts.APPLICANT_TYPE_ORDER[0]][0]
970
955 # dda_name_list = [] 971 # dda_name_list = []
956 # dda_num_list = [] 972 # dda_num_list = []
957 # for applicant_type in consts.APPLICANT_TYPE_ORDER[:2]: 973 if len(company_info_list) > 0:
974 # tmp_idx = 1
975 company_info = company_info_list[0]
976 else:
977 # tmp_idx = 0
978 company_info = None
979
980 # for applicant_type in consts.APPLICANT_TYPE_ORDER[tmp_idx: tmp_idx + 2]:
958 # if applicant_type in main_role_info: 981 # if applicant_type in main_role_info:
959 # for dda_name_part, _, dda_num_part in main_role_info[applicant_type]: 982 # for dda_name_part, _, dda_num_part in main_role_info[applicant_type]:
960 # dda_name_list.append(dda_name_part) 983 # dda_name_list.append(dda_name_part)
...@@ -963,11 +986,6 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -963,11 +986,6 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
963 # dda_num = '、'.join(dda_num_list) 986 # dda_num = '、'.join(dda_num_list)
964 # del main_role_info 987 # del main_role_info
965 988
966 if len(company_info_list) > 0:
967 company_info = company_info_list[0]
968 else:
969 company_info = None
970
971 vehicle_info = {} 989 vehicle_info = {}
972 vehicle_field_input = [] 990 vehicle_field_input = []
973 vehicle_status = cms_info.get('vehicleStatus', '') 991 vehicle_status = cms_info.get('vehicleStatus', '')
...@@ -977,16 +995,15 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -977,16 +995,15 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
977 # 新车发票---------------------------------------------------------------------------------------------------------- 995 # 新车发票----------------------------------------------------------------------------------------------------------
978 if vehicle_status == 'New': 996 if vehicle_status == 'New':
979 vehicle_field_input.append(('vinNo', vin_no)) 997 vehicle_field_input.append(('vinNo', vin_no))
980 vehicle_field_input.append( 998 vehicle_field_input.append(('dealer', '、'.join([dealer_name, cms_info.get('fapiaoIssuerDealer', '')])))
981 ('dealer', '、'.join([dealer_name, cms_info.get('fapiaoIssuerDealer', '')])))
982 vehicle_field_input.append(('vehicleTransactionAmount', amount)) 999 vehicle_field_input.append(('vehicleTransactionAmount', amount))
983 1000
984 if isinstance(company_info, tuple): 1001 if isinstance(company_info, tuple):
985 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], company_info[0])) 1002 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], co_name if is_cdfl else company_info[0])) # 车贷分离
986 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], company_info[1])) 1003 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], co_id if is_cdfl else company_info[1])) # 车贷分离
987 else: 1004 else:
988 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], hmh_name)) 1005 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], co_name if is_cdfl else main_name)) # 车贷分离
989 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], hmh_id)) 1006 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], co_id if is_cdfl else main_id)) # 车贷分离
990 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[2], first_submission_date)) 1007 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[2], first_submission_date))
991 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[3], consts.SE_STAMP_VALUE)) 1008 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[3], consts.SE_STAMP_VALUE))
992 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[4], consts.SE_FPL_VALUE)) 1009 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[4], consts.SE_FPL_VALUE))
...@@ -998,7 +1015,6 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -998,7 +1015,6 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
998 ]))) 1015 ])))
999 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[6], consts.SE_LAYOUT_VALUE)) 1016 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[6], consts.SE_LAYOUT_VALUE))
1000 vehicle_info[consts.MVI_EN] = vehicle_field_input 1017 vehicle_info[consts.MVI_EN] = vehicle_field_input
1001 compare_info['vehicleInfo'] = vehicle_info
1002 # 二手车发票、交易凭证、绿本------------------------------------------------------------------------------------------ 1018 # 二手车发票、交易凭证、绿本------------------------------------------------------------------------------------------
1003 # else: 1019 # else:
1004 # gb_field_input = [ 1020 # gb_field_input = [
...@@ -1009,22 +1025,23 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -1009,22 +1025,23 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
1009 # vehicle_field_input.append(('vinNo', vin_no)) 1025 # vehicle_field_input.append(('vinNo', vin_no))
1010 # vehicle_field_input.append(('vehicleTransactionAmount', amount)) 1026 # vehicle_field_input.append(('vehicleTransactionAmount', amount))
1011 # if isinstance(company_info, tuple): 1027 # if isinstance(company_info, tuple):
1012 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], company_info[0])) 1028 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], co_name if is_cdfl else company_info[0])) # 车贷分离
1013 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], company_info[1])) 1029 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], co_id if is_cdfl else company_info[1])) # 车贷分离
1014 # jypz_field_input.append((consts.SE_NEW_ADD_FIELD[0], company_info[0])) 1030 # jypz_field_input.append((consts.SE_NEW_ADD_FIELD[0], co_name if is_cdfl else company_info[0])) # 车贷分离
1015 # jypz_field_input.append((consts.SE_NEW_ADD_FIELD[1], company_info[1])) 1031 # jypz_field_input.append((consts.SE_NEW_ADD_FIELD[1], co_id if is_cdfl else company_info[1])) # 车贷分离
1016 # gb34_field_input.append((consts.SE_GB_USED_FIELD[0], company_info[0])) 1032 # gb34_field_input.append((consts.SE_GB_USED_FIELD[0], co_name if is_cdfl else company_info[0])) # 车贷分离
1017 # gb34_field_input.append((consts.SE_GB_USED_FIELD[1], company_info[1])) 1033 # gb34_field_input.append((consts.SE_GB_USED_FIELD[1], co_id if is_cdfl else company_info[1])) # 车贷分离
1018 # else: 1034 # else:
1019 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], main_name)) 1035 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], co_name if is_cdfl else main_name)) # 车贷分离
1020 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], main_num)) 1036 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], co_id if is_cdfl else main_id_all)) # 车贷分离
1021 # jypz_field_input.append((consts.SE_NEW_ADD_FIELD[0], main_name)) 1037 # jypz_field_input.append((consts.SE_NEW_ADD_FIELD[0], co_name if is_cdfl else main_name)) # 车贷分离
1022 # jypz_field_input.append((consts.SE_NEW_ADD_FIELD[1], main_num)) 1038 # jypz_field_input.append((consts.SE_NEW_ADD_FIELD[1], co_id if is_cdfl else main_id_all)) # 车贷分离
1023 # gb34_field_input.append((consts.SE_GB_USED_FIELD[0], main_name)) 1039 # gb34_field_input.append((consts.SE_GB_USED_FIELD[0], co_name if is_cdfl else main_name)) # 车贷分离
1024 # gb34_field_input.append((consts.SE_GB_USED_FIELD[1], main_num)) 1040 # gb34_field_input.append((consts.SE_GB_USED_FIELD[1], co_id if is_cdfl else main_id_all)) # 车贷分离
1025 # gb34_field_input.append((consts.SE_GB_USED_FIELD[2], first_submission_date)) 1041 # gb34_field_input.append((consts.SE_GB_USED_FIELD[2], first_submission_date))
1026 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[2], first_submission_date)) 1042 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[2], first_submission_date))
1027 # # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[3], consts.SE_STAMP_VALUE)) 1043 # # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[3], consts.SE_STAMP_VALUE))
1044 # jypz_field_input.append(('dealerName', dealer_name))
1028 # jypz_field_input.append(('vinNo', vin_no)) 1045 # jypz_field_input.append(('vinNo', vin_no))
1029 # jypz_field_input.append(('vehicleTransactionAmount', amount)) 1046 # jypz_field_input.append(('vehicleTransactionAmount', amount))
1030 # jypz_field_input.append((consts.SE_GB_USED_FIELD[-1], first_submission_date)) 1047 # jypz_field_input.append((consts.SE_GB_USED_FIELD[-1], first_submission_date))
...@@ -1037,7 +1054,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -1037,7 +1054,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
1037 # vehicle_info[consts.JYPZ_EN] = jypz_field_input 1054 # vehicle_info[consts.JYPZ_EN] = jypz_field_input
1038 # if detect_list[0] and detect_list[1]: 1055 # if detect_list[0] and detect_list[1]:
1039 # vehicle_info[consts.UCI_EN] = vehicle_field_input 1056 # vehicle_info[consts.UCI_EN] = vehicle_field_input
1040 # compare_info['vehicleInfo'] = vehicle_info 1057 compare_info['vehicleInfo'] = vehicle_info
1041 1058
1042 # 银行卡------------------------------------------------------------------------------------------------------- 1059 # 银行卡-------------------------------------------------------------------------------------------------------
1043 bank_info = {} 1060 bank_info = {}
...@@ -1062,8 +1079,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -1062,8 +1079,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
1062 # ('applicationId(1)', last_obj.application_id), 1079 # ('applicationId(1)', last_obj.application_id),
1063 # ('applicationId(2)', last_obj.application_id), 1080 # ('applicationId(2)', last_obj.application_id),
1064 # ('bankName', bank_name), 1081 # ('bankName', bank_name),
1065 # ('companyName', 1082 # ('companyName', consts.HIL_COMPANY_NAME if application_entity in consts.HIL_SET else consts.AFC_COMPANY_NAME),
1066 # consts.HIL_COMPANY_NAME if application_entity in consts.HIL_SET else consts.AFC_COMPANY_NAME),
1067 # ('customerName', dda_name), 1083 # ('customerName', dda_name),
1068 # ('idNum', dda_num), 1084 # ('idNum', dda_num),
1069 # ('accountHolderName', account_holder_name), 1085 # ('accountHolderName', account_holder_name),
...@@ -1113,8 +1129,8 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -1113,8 +1129,8 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
1113 full_no = cms_info.get('settlemnetVerification', {}).get('applicationNo', '') 1129 full_no = cms_info.get('settlemnetVerification', {}).get('applicationNo', '')
1114 if cms_info.get('mortgageType', '') == 'Mortgage Free' or cms_info.get('mortgageType', '') == 'MortgageFree': 1130 if cms_info.get('mortgageType', '') == 'Mortgage Free' or cms_info.get('mortgageType', '') == 'MortgageFree':
1115 hmh_field_input = [ 1131 hmh_field_input = [
1116 (consts.SE_HMH_FIELD[0], hmh_name), 1132 (consts.SE_HMH_FIELD[0], main_name),
1117 (consts.SE_HMH_FIELD[1], hmh_id), 1133 (consts.SE_HMH_FIELD[1], main_id),
1118 (consts.SE_HMH_FIELD[2], full_no), 1134 (consts.SE_HMH_FIELD[2], full_no),
1119 (consts.SE_HMH_FIELD[3], cms_info.get('financeCompany', '')), 1135 (consts.SE_HMH_FIELD[3], cms_info.get('financeCompany', '')),
1120 (consts.SE_HMH_FIELD[4], consts.SE_STAMP_VALUE), 1136 (consts.SE_HMH_FIELD[4], consts.SE_STAMP_VALUE),
...@@ -1189,8 +1205,8 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -1189,8 +1205,8 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
1189 # else: 1205 # else:
1190 # dszx_amount = '500000' 1206 # dszx_amount = '500000'
1191 # bd_field_input = [ 1207 # bd_field_input = [
1192 # (consts.SE_BD_FIELD[0], hmh_name), 1208 # (consts.SE_BD_FIELD[0], [co_name, bo_name] if is_cdfl else [main_name, ]), # 车贷分离
1193 # (consts.SE_BD_FIELD[1], hmh_id), 1209 # (consts.SE_BD_FIELD[1], [co_id, bo_id] if is_cdfl else [main_id, ]), # 车贷分离
1194 # (consts.SE_BD_FIELD[2], vin_no), 1210 # (consts.SE_BD_FIELD[2], vin_no),
1195 # (consts.SE_BD_FIELD[3], ssx_amount), 1211 # (consts.SE_BD_FIELD[3], ssx_amount),
1196 # (consts.SE_BD_FIELD[4], dszx_amount), 1212 # (consts.SE_BD_FIELD[4], dszx_amount),
...@@ -1227,8 +1243,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -1227,8 +1243,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
1227 (consts.SE_HIL_CON_1_FIELD[2], vin_no), 1243 (consts.SE_HIL_CON_1_FIELD[2], vin_no),
1228 (consts.SE_HIL_CON_1_FIELD[3], dealer_name), 1244 (consts.SE_HIL_CON_1_FIELD[3], dealer_name),
1229 (consts.SE_HIL_CON_1_FIELD[4], amount), 1245 (consts.SE_HIL_CON_1_FIELD[4], amount),
1230 (consts.SE_HIL_CON_1_FIELD[5], 1246 (consts.SE_HIL_CON_1_FIELD[5], str(cms_info.get('financialInformation', {}).get('originationPrincipal', '0.0'))),
1231 str(cms_info.get('financialInformation', {}).get('originationPrincipal', '0.0'))),
1232 (consts.SE_HIL_CON_1_FIELD[6], str(cms_info.get('terms', '0'))), 1247 (consts.SE_HIL_CON_1_FIELD[6], str(cms_info.get('terms', '0'))),
1233 (consts.SE_HIL_CON_1_FIELD[7], schedule_list_str), 1248 (consts.SE_HIL_CON_1_FIELD[7], schedule_list_str),
1234 (consts.SE_HIL_CON_1_FIELD[11], account_no), 1249 (consts.SE_HIL_CON_1_FIELD[11], account_no),
...@@ -1243,12 +1258,13 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -1243,12 +1258,13 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
1243 if isinstance(company_info, tuple): 1258 if isinstance(company_info, tuple):
1244 hil_contract_1_input.append((consts.SE_HIL_CON_1_FIELD[10], company_info[2])) 1259 hil_contract_1_input.append((consts.SE_HIL_CON_1_FIELD[10], company_info[2]))
1245 1260
1246 for key, app_type, id_idx, field_idx, is_force, e_write in consts.ROLE_LIST_1: 1261 for key_hil1, cdfl_key, app_type, id_idx, field_idx, is_force, e_write in consts.ROLE_LIST_1:
1247 if not e_write and not online_sign: 1262 if not e_write and not online_sign:
1248 continue 1263 continue
1264 key = cdfl_key if is_cdfl else key_hil1
1249 is_find = False 1265 is_find = False
1250 if app_type in main_role_info: 1266 if app_type in main_role_info:
1251 if len(main_role_info[app_type]) >= id_idx + 1: 1267 if len(main_role_info[app_type]) >= id_idx+1:
1252 is_find = True 1268 is_find = True
1253 if isinstance(field_idx, int): 1269 if isinstance(field_idx, int):
1254 hil_contract_1_input.append((key, main_role_info[app_type][id_idx][field_idx])) 1270 hil_contract_1_input.append((key, main_role_info[app_type][id_idx][field_idx]))
...@@ -1262,15 +1278,15 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -1262,15 +1278,15 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
1262 if fp_campaign.find('Joy_Select') != -1 or fp_campaign.find('JoySelect') != -1: 1278 if fp_campaign.find('Joy_Select') != -1 or fp_campaign.find('JoySelect') != -1:
1263 hil_contract_3_input = [ 1279 hil_contract_3_input = [
1264 (consts.SE_HIL_CON_3_FIELD[0], [full_no] if online_sign else full_no), 1280 (consts.SE_HIL_CON_3_FIELD[0], [full_no] if online_sign else full_no),
1265 (consts.SE_HIL_CON_3_FIELD[1], hmh_name), 1281 (consts.SE_HIL_CON_3_FIELD[1], main_name),
1266 (consts.SE_HIL_CON_3_FIELD[2], hmh_id), 1282 (consts.SE_HIL_CON_3_FIELD[2], main_id),
1267 (consts.SE_HIL_CON_3_FIELD[3], dealer_name), 1283 (consts.SE_HIL_CON_3_FIELD[3], dealer_name),
1268 (consts.SE_HIL_CON_3_FIELD[4], full_no), 1284 (consts.SE_HIL_CON_3_FIELD[4], full_no),
1269 (consts.SE_HIL_CON_3_FIELD[5], hmh_name), 1285 (consts.SE_HIL_CON_3_FIELD[5], main_name),
1270 (consts.SE_HIL_CON_3_FIELD[6], hmh_id), 1286 (consts.SE_HIL_CON_3_FIELD[6], main_id),
1271 ] 1287 ]
1272 # if online_sign: 1288 if online_sign:
1273 # hil_contract_3_input.append((consts.SE_HIL_CON_3_FIELD[7], hmh_name)) 1289 hil_contract_3_input.append((consts.SE_HIL_CON_3_FIELD[7], main_name))
1274 contract_info[consts.HIL_CONTRACT_3_EN] = hil_contract_3_input 1290 contract_info[consts.HIL_CONTRACT_3_EN] = hil_contract_3_input
1275 1291
1276 # HIL合同 车辆租赁抵押合同 -------------------------------------------------------------------------------------- 1292 # HIL合同 车辆租赁抵押合同 --------------------------------------------------------------------------------------
...@@ -1282,14 +1298,15 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -1282,14 +1298,15 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
1282 (consts.SE_HIL_CON_2_FIELD[4], str(cms_info.get('terms', '0'))), 1298 (consts.SE_HIL_CON_2_FIELD[4], str(cms_info.get('terms', '0'))),
1283 ] 1299 ]
1284 1300
1285 for key, app_type, id_idx, field_idx, is_force, e_write, co_skip in consts.ROLE_LIST_2: 1301 for key, app_type_hil2, cdfl_app_type, id_idx, field_idx, is_force, e_write, co_skip in consts.ROLE_LIST_2:
1286 if co_skip and isinstance(company_info, tuple): 1302 if co_skip and isinstance(company_info, tuple):
1287 continue 1303 continue
1288 if not e_write and not online_sign: 1304 if not e_write and not online_sign:
1289 continue 1305 continue
1306 app_type = cdfl_app_type if is_cdfl else app_type_hil2
1290 is_find = False 1307 is_find = False
1291 if app_type in main_role_info: 1308 if app_type in main_role_info:
1292 if len(main_role_info[app_type]) >= id_idx + 1: 1309 if len(main_role_info[app_type]) >= id_idx+1:
1293 is_find = True 1310 is_find = True
1294 if isinstance(field_idx, int): 1311 if isinstance(field_idx, int):
1295 hil_contract_2_input.append((key, main_role_info[app_type][id_idx][field_idx])) 1312 hil_contract_2_input.append((key, main_role_info[app_type][id_idx][field_idx]))
...@@ -1307,20 +1324,16 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -1307,20 +1324,16 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
1307 (consts.SE_AFC_CON_FIELD[0], full_no), 1324 (consts.SE_AFC_CON_FIELD[0], full_no),
1308 (consts.SE_AFC_CON_FIELD[1], amount), 1325 (consts.SE_AFC_CON_FIELD[1], amount),
1309 (consts.SE_AFC_CON_FIELD[2], vin_no), 1326 (consts.SE_AFC_CON_FIELD[2], vin_no),
1310 (consts.SE_AFC_CON_FIELD[3], 1327 (consts.SE_AFC_CON_FIELD[3], str(cms_info.get('financialInformation', {}).get('originationPrincipal', '0.0'))),
1311 str(cms_info.get('financialInformation', {}).get('originationPrincipal', '0.0'))),
1312 (consts.SE_AFC_CON_FIELD[4], str(cms_info.get('terms', '0'))), 1328 (consts.SE_AFC_CON_FIELD[4], str(cms_info.get('terms', '0'))),
1313 (consts.SE_AFC_CON_FIELD[5], vehicle_principal_str), 1329 (consts.SE_AFC_CON_FIELD[5], vehicle_principal_str),
1314 (consts.SE_AFC_CON_FIELD[6], 1330 (consts.SE_AFC_CON_FIELD[6], str(cms_info.get('financialInformation', {}).get('associatedServicePrincipal', '0.0'))),
1315 str(cms_info.get('financialInformation', {}).get('associatedServicePrincipal', '0.0'))),
1316 (consts.SE_AFC_CON_FIELD[7], amount), 1331 (consts.SE_AFC_CON_FIELD[7], amount),
1317 (consts.SE_AFC_CON_FIELD[8], vin_no), 1332 (consts.SE_AFC_CON_FIELD[8], vin_no),
1318 (consts.SE_AFC_CON_FIELD[9], dealer_name), 1333 (consts.SE_AFC_CON_FIELD[9], dealer_name),
1319 (consts.SE_AFC_CON_FIELD[10], 1334 (consts.SE_AFC_CON_FIELD[10], str(cms_info.get('financialInformation', {}).get('originationPrincipal', '0.0'))),
1320 str(cms_info.get('financialInformation', {}).get('originationPrincipal', '0.0'))),
1321 (consts.SE_AFC_CON_FIELD[11], vehicle_principal_str), 1335 (consts.SE_AFC_CON_FIELD[11], vehicle_principal_str),
1322 (consts.SE_AFC_CON_FIELD[12], 1336 (consts.SE_AFC_CON_FIELD[12], str(cms_info.get('financialInformation', {}).get('associatedServicePrincipal', '0.0'))),
1323 str(cms_info.get('financialInformation', {}).get('associatedServicePrincipal', '0.0'))),
1324 (consts.SE_AFC_CON_FIELD[13], str(cms_info.get('terms', '0'))), 1337 (consts.SE_AFC_CON_FIELD[13], str(cms_info.get('terms', '0'))),
1325 (consts.SE_AFC_CON_FIELD[14], account_no), 1338 (consts.SE_AFC_CON_FIELD[14], account_no),
1326 (consts.SE_AFC_CON_FIELD[15], account_holder_name), 1339 (consts.SE_AFC_CON_FIELD[15], account_holder_name),
...@@ -1339,12 +1352,13 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -1339,12 +1352,13 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
1339 afc_contract_input.pop(9) 1352 afc_contract_input.pop(9)
1340 1353
1341 # '借款人签字及时间', 'Borrower', 0, 0, True 1354 # '借款人签字及时间', 'Borrower', 0, 0, True
1342 for key, app_type, id_idx, field_idx, is_force, e_write in consts.ROLE_LIST: 1355 for key_afc1, cdfl_key, app_type, id_idx, field_idx, is_force, e_write in consts.ROLE_LIST:
1343 if not e_write and not online_sign: 1356 if not e_write and not online_sign:
1344 continue 1357 continue
1358 key = cdfl_key if is_cdfl else key_afc1
1345 is_find = False 1359 is_find = False
1346 if app_type in main_role_info: 1360 if app_type in main_role_info:
1347 if len(main_role_info[app_type]) >= id_idx + 1: 1361 if len(main_role_info[app_type]) >= id_idx+1:
1348 is_find = True 1362 is_find = True
1349 if isinstance(field_idx, int): 1363 if isinstance(field_idx, int):
1350 afc_contract_input.append((key, main_role_info[app_type][id_idx][field_idx])) 1364 afc_contract_input.append((key, main_role_info[app_type][id_idx][field_idx]))
...@@ -1374,7 +1388,8 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1374,7 +1388,8 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1374 dealer_name_list = cms_info.get('dealerName', '').split() 1388 dealer_name_list = cms_info.get('dealerName', '').split()
1375 dealer_name = '' if len(dealer_name_list) == 0 else dealer_name_list[-1] 1389 dealer_name = '' if len(dealer_name_list) == 0 else dealer_name_list[-1]
1376 1390
1377 # 个人信息证件--------------------------------------------------------------------------------------------------------- 1391 # 个人信息证件------------------------------------------------------------------------------------------------------
1392 is_cdfl = True # 车贷分离
1378 # province = cms_info.get('province', '') 1393 # province = cms_info.get('province', '')
1379 for individual_info in cms_info.get('applicantInformation', []): 1394 for individual_info in cms_info.get('applicantInformation', []):
1380 all_id_num = [] 1395 all_id_num = []
...@@ -1386,6 +1401,13 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1386,6 +1401,13 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1386 establishment_date = individual_info.get('establishmentDate', '') 1401 establishment_date = individual_info.get('establishmentDate', '')
1387 # date_of_birth = individual_info.get('dateOfBirth', '') 1402 # date_of_birth = individual_info.get('dateOfBirth', '')
1388 1403
1404 # 车贷分离判断
1405 is_corporate = individual_info.get('customersubType', '') == 'Corporate'
1406 if individual_info['applicantType'] == consts.APPLICANT_TYPE_ORDER[1] and not is_corporate:
1407 is_cdfl = False
1408 if individual_info['applicantType'] == consts.APPLICANT_TYPE_ORDER[0] and is_corporate:
1409 is_cdfl = False
1410
1389 for id_info in individual_info.get('IDInformation', []): 1411 for id_info in individual_info.get('IDInformation', []):
1390 if id_info.get('idType') in consts.SE_CMS_FIRST_ID_FIELD_MAPPING: 1412 if id_info.get('idType') in consts.SE_CMS_FIRST_ID_FIELD_MAPPING:
1391 license_en, is_prc = consts.SE_CMS_FIRST_ID_FIELD_MAPPING[id_info['idType']] 1413 license_en, is_prc = consts.SE_CMS_FIRST_ID_FIELD_MAPPING[id_info['idType']]
...@@ -1412,7 +1434,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1412,7 +1434,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1412 ('businessLicenseDueDate', id_info.get('idExpiryDate', '')), 1434 ('businessLicenseDueDate', id_info.get('idExpiryDate', '')),
1413 ] 1435 ]
1414 1436
1415 if individual_info.get('customersubType', '') == 'Corporate': 1437 if is_corporate:
1416 company_info_list.append((customer_name, id_num, legal_name)) 1438 company_info_list.append((customer_name, id_num, legal_name))
1417 else: 1439 else:
1418 bl_field_input.append(('establishmentDate', establishment_date)) 1440 bl_field_input.append(('establishmentDate', establishment_date))
...@@ -1420,7 +1442,6 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1420,7 +1442,6 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1420 license_dict[consts.BL_EN] = bl_field_input 1442 license_dict[consts.BL_EN] = bl_field_input
1421 all_id_num.append(id_num) 1443 all_id_num.append(id_num)
1422 1444
1423
1424 # SME营业执照--------------------------------------------------------------------------------------------------- 1445 # SME营业执照---------------------------------------------------------------------------------------------------
1425 # if individual_info.get('customersubType', '').startswith('Self Employed'): 1446 # if individual_info.get('customersubType', '').startswith('Self Employed'):
1426 # sep_field_input = [ 1447 # sep_field_input = [
...@@ -1439,29 +1460,34 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1439,29 +1460,34 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1439 1460
1440 compare_info['applicantInformation'] = individual_info_dict 1461 compare_info['applicantInformation'] = individual_info_dict
1441 1462
1442 main_name = main_num = hmh_name = hmh_id = '' 1463 main_name = main_id_all = main_id = ''
1443 for applicant_type in consts.APPLICANT_TYPE_ORDER: 1464 for applicant_type in consts.APPLICANT_TYPE_ORDER:
1444 if applicant_type in main_role_info: 1465 if applicant_type in main_role_info:
1445 main_name, main_num, _ = main_role_info[applicant_type][0] 1466 main_name, main_id_all, main_id = main_role_info[applicant_type][0]
1446 hmh_name, _, hmh_id = main_role_info[applicant_type][0] 1467 # hmh_name, _, hmh_id = main_role_info[applicant_type][0]
1447 break 1468 break
1448 1469
1449 dda_name_list = [] 1470 co_name = co_id = bo_name = bo_id = ''
1450 dda_num_list = [] 1471 if is_cdfl:
1472 co_name, _, co_id = main_role_info[consts.APPLICANT_TYPE_ORDER[1]][0]
1473 bo_name, _, bo_id = main_role_info[consts.APPLICANT_TYPE_ORDER[0]][0]
1474
1475 # dda_name_list = []
1476 # dda_num_list = []
1451 if len(company_info_list) > 0: 1477 if len(company_info_list) > 0:
1452 tmp_idx = 1 1478 # tmp_idx = 1
1453 company_info = company_info_list[0] 1479 company_info = company_info_list[0]
1454 else: 1480 else:
1455 tmp_idx = 0 1481 # tmp_idx = 0
1456 company_info = None 1482 company_info = None
1457 1483
1458 for applicant_type in consts.APPLICANT_TYPE_ORDER[tmp_idx: tmp_idx + 2]: 1484 # for applicant_type in consts.APPLICANT_TYPE_ORDER[tmp_idx: tmp_idx + 2]:
1459 if applicant_type in main_role_info: 1485 # if applicant_type in main_role_info:
1460 for dda_name_part, _, dda_num_part in main_role_info[applicant_type]: 1486 # for dda_name_part, _, dda_num_part in main_role_info[applicant_type]:
1461 dda_name_list.append(dda_name_part) 1487 # dda_name_list.append(dda_name_part)
1462 dda_num_list.append(dda_num_part) 1488 # dda_num_list.append(dda_num_part)
1463 dda_name = '、'.join(dda_name_list) 1489 # dda_name = '、'.join(dda_name_list)
1464 dda_num = '、'.join(dda_num_list) 1490 # dda_num = '、'.join(dda_num_list)
1465 # del main_role_info 1491 # del main_role_info
1466 1492
1467 vehicle_info = {} 1493 vehicle_info = {}
...@@ -1477,11 +1503,11 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1477,11 +1503,11 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1477 vehicle_field_input.append(('vehicleTransactionAmount', amount)) 1503 vehicle_field_input.append(('vehicleTransactionAmount', amount))
1478 1504
1479 if isinstance(company_info, tuple): 1505 if isinstance(company_info, tuple):
1480 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], company_info[0])) 1506 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], co_name if is_cdfl else company_info[0])) # 车贷分离
1481 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], company_info[1])) 1507 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], co_id if is_cdfl else company_info[1])) # 车贷分离
1482 else: 1508 else:
1483 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], hmh_name)) 1509 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], co_name if is_cdfl else main_name)) # 车贷分离
1484 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], hmh_id)) 1510 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], co_id if is_cdfl else main_id)) # 车贷分离
1485 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[2], first_submission_date)) 1511 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[2], first_submission_date))
1486 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[3], consts.SE_STAMP_VALUE)) 1512 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[3], consts.SE_STAMP_VALUE))
1487 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[4], consts.SE_FPL_VALUE)) 1513 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[4], consts.SE_FPL_VALUE))
...@@ -1503,19 +1529,19 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1503,19 +1529,19 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1503 vehicle_field_input.append(('vinNo', vin_no)) 1529 vehicle_field_input.append(('vinNo', vin_no))
1504 vehicle_field_input.append(('vehicleTransactionAmount', amount)) 1530 vehicle_field_input.append(('vehicleTransactionAmount', amount))
1505 if isinstance(company_info, tuple): 1531 if isinstance(company_info, tuple):
1506 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], company_info[0])) 1532 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], co_name if is_cdfl else company_info[0])) # 车贷分离
1507 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], company_info[1])) 1533 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], co_id if is_cdfl else company_info[1])) # 车贷分离
1508 jypz_field_input.append((consts.SE_NEW_ADD_FIELD[0], company_info[0])) 1534 jypz_field_input.append((consts.SE_NEW_ADD_FIELD[0], co_name if is_cdfl else company_info[0])) # 车贷分离
1509 jypz_field_input.append((consts.SE_NEW_ADD_FIELD[1], company_info[1])) 1535 jypz_field_input.append((consts.SE_NEW_ADD_FIELD[1], co_id if is_cdfl else company_info[1])) # 车贷分离
1510 gb34_field_input.append((consts.SE_GB_USED_FIELD[0], company_info[0])) 1536 gb34_field_input.append((consts.SE_GB_USED_FIELD[0], co_name if is_cdfl else company_info[0])) # 车贷分离
1511 gb34_field_input.append((consts.SE_GB_USED_FIELD[1], company_info[1])) 1537 gb34_field_input.append((consts.SE_GB_USED_FIELD[1], co_id if is_cdfl else company_info[1])) # 车贷分离
1512 else: 1538 else:
1513 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], main_name)) 1539 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], co_name if is_cdfl else main_name)) # 车贷分离
1514 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], main_num)) 1540 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], co_id if is_cdfl else main_id_all)) # 车贷分离
1515 jypz_field_input.append((consts.SE_NEW_ADD_FIELD[0], main_name)) 1541 jypz_field_input.append((consts.SE_NEW_ADD_FIELD[0], co_name if is_cdfl else main_name)) # 车贷分离
1516 jypz_field_input.append((consts.SE_NEW_ADD_FIELD[1], main_num)) 1542 jypz_field_input.append((consts.SE_NEW_ADD_FIELD[1], co_id if is_cdfl else main_id_all)) # 车贷分离
1517 gb34_field_input.append((consts.SE_GB_USED_FIELD[0], main_name)) 1543 gb34_field_input.append((consts.SE_GB_USED_FIELD[0], co_name if is_cdfl else main_name)) # 车贷分离
1518 gb34_field_input.append((consts.SE_GB_USED_FIELD[1], main_num)) 1544 gb34_field_input.append((consts.SE_GB_USED_FIELD[1], co_id if is_cdfl else main_id_all)) # 车贷分离
1519 gb34_field_input.append((consts.SE_GB_USED_FIELD[2], first_submission_date)) 1545 gb34_field_input.append((consts.SE_GB_USED_FIELD[2], first_submission_date))
1520 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[2], first_submission_date)) 1546 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[2], first_submission_date))
1521 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[3], consts.SE_STAMP_VALUE)) 1547 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[3], consts.SE_STAMP_VALUE))
...@@ -1607,8 +1633,8 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1607,8 +1633,8 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1607 full_no = cms_info.get('settlemnetVerification', {}).get('applicationNo', '') 1633 full_no = cms_info.get('settlemnetVerification', {}).get('applicationNo', '')
1608 if cms_info.get('mortgageType', '') == 'Mortgage Free' or cms_info.get('mortgageType', '') == 'MortgageFree': 1634 if cms_info.get('mortgageType', '') == 'Mortgage Free' or cms_info.get('mortgageType', '') == 'MortgageFree':
1609 hmh_field_input = [ 1635 hmh_field_input = [
1610 (consts.SE_HMH_FIELD[0], hmh_name), 1636 (consts.SE_HMH_FIELD[0], main_name),
1611 (consts.SE_HMH_FIELD[1], hmh_id), 1637 (consts.SE_HMH_FIELD[1], main_id),
1612 (consts.SE_HMH_FIELD[2], full_no), 1638 (consts.SE_HMH_FIELD[2], full_no),
1613 (consts.SE_HMH_FIELD[3], cms_info.get('financeCompany', '')), 1639 (consts.SE_HMH_FIELD[3], cms_info.get('financeCompany', '')),
1614 (consts.SE_HMH_FIELD[4], consts.SE_STAMP_VALUE), 1640 (consts.SE_HMH_FIELD[4], consts.SE_STAMP_VALUE),
...@@ -1683,8 +1709,8 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1683,8 +1709,8 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1683 else: 1709 else:
1684 dszx_amount = '500000' 1710 dszx_amount = '500000'
1685 bd_field_input = [ 1711 bd_field_input = [
1686 (consts.SE_BD_FIELD[0], hmh_name), 1712 (consts.SE_BD_FIELD[0], [co_name, bo_name] if is_cdfl else [main_name, ]), # 车贷分离
1687 (consts.SE_BD_FIELD[1], hmh_id), 1713 (consts.SE_BD_FIELD[1], [co_id, bo_id] if is_cdfl else [main_id, ]), # 车贷分离
1688 (consts.SE_BD_FIELD[2], vin_no), 1714 (consts.SE_BD_FIELD[2], vin_no),
1689 (consts.SE_BD_FIELD[3], ssx_amount), 1715 (consts.SE_BD_FIELD[3], ssx_amount),
1690 (consts.SE_BD_FIELD[4], dszx_amount), 1716 (consts.SE_BD_FIELD[4], dszx_amount),
...@@ -1736,9 +1762,10 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1736,9 +1762,10 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1736 if isinstance(company_info, tuple): 1762 if isinstance(company_info, tuple):
1737 hil_contract_1_input.append((consts.SE_HIL_CON_1_FIELD[10], company_info[2])) 1763 hil_contract_1_input.append((consts.SE_HIL_CON_1_FIELD[10], company_info[2]))
1738 1764
1739 for key, app_type, id_idx, field_idx, is_force, e_write in consts.ROLE_LIST_1: 1765 for key_hil1, cdfl_key, app_type, id_idx, field_idx, is_force, e_write in consts.ROLE_LIST_1:
1740 if not e_write and not online_sign: 1766 if not e_write and not online_sign:
1741 continue 1767 continue
1768 key = cdfl_key if is_cdfl else key_hil1
1742 is_find = False 1769 is_find = False
1743 if app_type in main_role_info: 1770 if app_type in main_role_info:
1744 if len(main_role_info[app_type]) >= id_idx+1: 1771 if len(main_role_info[app_type]) >= id_idx+1:
...@@ -1755,15 +1782,15 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1755,15 +1782,15 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1755 if fp_campaign.find('Joy_Select') != -1 or fp_campaign.find('JoySelect') != -1: 1782 if fp_campaign.find('Joy_Select') != -1 or fp_campaign.find('JoySelect') != -1:
1756 hil_contract_3_input = [ 1783 hil_contract_3_input = [
1757 (consts.SE_HIL_CON_3_FIELD[0], [full_no] if online_sign else full_no), 1784 (consts.SE_HIL_CON_3_FIELD[0], [full_no] if online_sign else full_no),
1758 (consts.SE_HIL_CON_3_FIELD[1], hmh_name), 1785 (consts.SE_HIL_CON_3_FIELD[1], main_name),
1759 (consts.SE_HIL_CON_3_FIELD[2], hmh_id), 1786 (consts.SE_HIL_CON_3_FIELD[2], main_id),
1760 (consts.SE_HIL_CON_3_FIELD[3], dealer_name), 1787 (consts.SE_HIL_CON_3_FIELD[3], dealer_name),
1761 (consts.SE_HIL_CON_3_FIELD[4], full_no), 1788 (consts.SE_HIL_CON_3_FIELD[4], full_no),
1762 (consts.SE_HIL_CON_3_FIELD[5], hmh_name), 1789 (consts.SE_HIL_CON_3_FIELD[5], main_name),
1763 (consts.SE_HIL_CON_3_FIELD[6], hmh_id), 1790 (consts.SE_HIL_CON_3_FIELD[6], main_id),
1764 ] 1791 ]
1765 if online_sign: 1792 if online_sign:
1766 hil_contract_3_input.append((consts.SE_HIL_CON_3_FIELD[7], hmh_name)) 1793 hil_contract_3_input.append((consts.SE_HIL_CON_3_FIELD[7], main_name))
1767 contract_info[consts.HIL_CONTRACT_3_EN] = hil_contract_3_input 1794 contract_info[consts.HIL_CONTRACT_3_EN] = hil_contract_3_input
1768 1795
1769 # HIL合同 车辆租赁抵押合同 -------------------------------------------------------------------------------------- 1796 # HIL合同 车辆租赁抵押合同 --------------------------------------------------------------------------------------
...@@ -1775,11 +1802,12 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1775,11 +1802,12 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1775 (consts.SE_HIL_CON_2_FIELD[4], str(cms_info.get('terms', '0'))), 1802 (consts.SE_HIL_CON_2_FIELD[4], str(cms_info.get('terms', '0'))),
1776 ] 1803 ]
1777 1804
1778 for key, app_type, id_idx, field_idx, is_force, e_write, co_skip in consts.ROLE_LIST_2: 1805 for key, app_type_hil2, cdfl_app_type, id_idx, field_idx, is_force, e_write, co_skip in consts.ROLE_LIST_2:
1779 if co_skip and isinstance(company_info, tuple): 1806 if co_skip and isinstance(company_info, tuple):
1780 continue 1807 continue
1781 if not e_write and not online_sign: 1808 if not e_write and not online_sign:
1782 continue 1809 continue
1810 app_type = cdfl_app_type if is_cdfl else app_type_hil2
1783 is_find = False 1811 is_find = False
1784 if app_type in main_role_info: 1812 if app_type in main_role_info:
1785 if len(main_role_info[app_type]) >= id_idx+1: 1813 if len(main_role_info[app_type]) >= id_idx+1:
...@@ -1828,9 +1856,10 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1828,9 +1856,10 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1828 afc_contract_input.pop(9) 1856 afc_contract_input.pop(9)
1829 1857
1830 # '借款人签字及时间', 'Borrower', 0, 0, True 1858 # '借款人签字及时间', 'Borrower', 0, 0, True
1831 for key, app_type, id_idx, field_idx, is_force, e_write in consts.ROLE_LIST: 1859 for key_afc1, cdfl_key, app_type, id_idx, field_idx, is_force, e_write in consts.ROLE_LIST:
1832 if not e_write and not online_sign: 1860 if not e_write and not online_sign:
1833 continue 1861 continue
1862 key = cdfl_key if is_cdfl else key_afc1
1834 is_find = False 1863 is_find = False
1835 if app_type in main_role_info: 1864 if app_type in main_role_info:
1836 if len(main_role_info[app_type]) >= id_idx+1: 1865 if len(main_role_info[app_type]) >= id_idx+1:
......
src/common/tools/comparison.py
...@@ -180,6 +180,16 @@ class Comparison: ...@@ -180,6 +180,16 @@ class Comparison:
180 else: 180 else:
181 return self.RESULT_N 181 return self.RESULT_N
182 182
183 def super_list_compare(self, input_list, ocr_str, **kwargs):
184 for input_str in input_list:
185 if kwargs.get('method', 'common') == 'name':
186 if self.se_name_compare(input_str, ocr_str, **kwargs) == self.RESULT_Y:
187 return self.RESULT_Y
188 else:
189 if self.se_common_compare(input_str, ocr_str, **kwargs) == self.RESULT_Y:
190 return self.RESULT_Y
191 return self.RESULT_N
192
183 def se_date_contain_compare(self, input_str, ocr_str_or_list, **kwargs): 193 def se_date_contain_compare(self, input_str, ocr_str_or_list, **kwargs):
184 return self.RESULT_Y 194 return self.RESULT_Y
185 195
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!