Skip to content

周伟奇 / bmw-ocr

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

orderList modify

1 parent 7d44ed22
Inline Side-by-side
Showing 2 changed files with 16 additions and 8 deletions
src/apps/doc/consts.py
...@@ -1781,6 +1781,7 @@ DDA_COMPARE_LOGIC = { ...@@ -1781,6 +1781,7 @@ DDA_COMPARE_LOGIC = {
1781 1781
1782 JYPZ_COMPARE_LOGIC = { 1782 JYPZ_COMPARE_LOGIC = {
1783 'vinNo': ('vin', 'se_common_compare', {}, '二手车凭证车辆识别代号与系统车架号不一致'), 1783 'vinNo': ('vin', 'se_common_compare', {}, '二手车凭证车辆识别代号与系统车架号不一致'),
1784 'dealerName': ('authorized_dealer', 'se_common_compare', {}, '二手车凭证经销商与系统经销商不一致'),
1784 'vehicleTransactionAmount': ('price', 'se_amount_compare', {}, '二手车凭证购买方交易价格与系统车辆价格不一致'), 1785 'vehicleTransactionAmount': ('price', 'se_amount_compare', {}, '二手车凭证购买方交易价格与系统车辆价格不一致'),
1785 'customerName': ('buyer_name', 'se_name_compare', {'is_passport': True}, '二手车凭证购买方姓名与系统主借人姓名不一致'), 1786 'customerName': ('buyer_name', 'se_name_compare', {'is_passport': True}, '二手车凭证购买方姓名与系统主借人姓名不一致'),
1786 'idNum': ('buyer_id', 'se_contain_compare_2', {}, '二手车凭证购买方证件号与系统主借人证件号不一致'), 1787 'idNum': ('buyer_id', 'se_contain_compare_2', {}, '二手车凭证购买方证件号与系统主借人证件号不一致'),
......
src/celery_compare/tasks.py
...@@ -881,6 +881,9 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -881,6 +881,9 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
881 main_role_info = {} 881 main_role_info = {}
882 company_info_list = [] 882 company_info_list = []
883 883
884 dealer_name_list = cms_info.get('dealerName', '').split()
885 dealer_name = '' if len(dealer_name_list) == 0 else dealer_name_list[-1]
886
884 # 个人信息证件--------------------------------------------------------------------------------------------------------- 887 # 个人信息证件---------------------------------------------------------------------------------------------------------
885 # province = cms_info.get('province', '') 888 # province = cms_info.get('province', '')
886 for individual_info in cms_info.get('applicantInformation', []): 889 for individual_info in cms_info.get('applicantInformation', []):
...@@ -975,7 +978,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -975,7 +978,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
975 if vehicle_status == 'New': 978 if vehicle_status == 'New':
976 vehicle_field_input.append(('vinNo', vin_no)) 979 vehicle_field_input.append(('vinNo', vin_no))
977 vehicle_field_input.append( 980 vehicle_field_input.append(
978 ('dealer', '、'.join([cms_info.get('dealerName', ''), cms_info.get('fapiaoIssuerDealer', '')]))) 981 ('dealer', '、'.join([dealer_name, cms_info.get('fapiaoIssuerDealer', '')])))
979 vehicle_field_input.append(('vehicleTransactionAmount', amount)) 982 vehicle_field_input.append(('vehicleTransactionAmount', amount))
980 983
981 if isinstance(company_info, tuple): 984 if isinstance(company_info, tuple):
...@@ -1222,7 +1225,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -1222,7 +1225,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
1222 (consts.SE_HIL_CON_1_FIELD[0], [full_no] if online_sign else full_no), 1225 (consts.SE_HIL_CON_1_FIELD[0], [full_no] if online_sign else full_no),
1223 (consts.SE_HIL_CON_1_FIELD[1], full_no), 1226 (consts.SE_HIL_CON_1_FIELD[1], full_no),
1224 (consts.SE_HIL_CON_1_FIELD[2], vin_no), 1227 (consts.SE_HIL_CON_1_FIELD[2], vin_no),
1225 (consts.SE_HIL_CON_1_FIELD[3], cms_info.get('dealerName', '')), 1228 (consts.SE_HIL_CON_1_FIELD[3], dealer_name),
1226 (consts.SE_HIL_CON_1_FIELD[4], amount), 1229 (consts.SE_HIL_CON_1_FIELD[4], amount),
1227 (consts.SE_HIL_CON_1_FIELD[5], 1230 (consts.SE_HIL_CON_1_FIELD[5],
1228 str(cms_info.get('financialInformation', {}).get('originationPrincipal', '0.0'))), 1231 str(cms_info.get('financialInformation', {}).get('originationPrincipal', '0.0'))),
...@@ -1261,7 +1264,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -1261,7 +1264,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
1261 (consts.SE_HIL_CON_3_FIELD[0], [full_no] if online_sign else full_no), 1264 (consts.SE_HIL_CON_3_FIELD[0], [full_no] if online_sign else full_no),
1262 (consts.SE_HIL_CON_3_FIELD[1], hmh_name), 1265 (consts.SE_HIL_CON_3_FIELD[1], hmh_name),
1263 (consts.SE_HIL_CON_3_FIELD[2], hmh_id), 1266 (consts.SE_HIL_CON_3_FIELD[2], hmh_id),
1264 (consts.SE_HIL_CON_3_FIELD[3], cms_info.get('dealerName', '')), 1267 (consts.SE_HIL_CON_3_FIELD[3], dealer_name),
1265 (consts.SE_HIL_CON_3_FIELD[4], full_no), 1268 (consts.SE_HIL_CON_3_FIELD[4], full_no),
1266 (consts.SE_HIL_CON_3_FIELD[5], hmh_name), 1269 (consts.SE_HIL_CON_3_FIELD[5], hmh_name),
1267 (consts.SE_HIL_CON_3_FIELD[6], hmh_id), 1270 (consts.SE_HIL_CON_3_FIELD[6], hmh_id),
...@@ -1312,7 +1315,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -1312,7 +1315,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
1312 str(cms_info.get('financialInformation', {}).get('associatedServicePrincipal', '0.0'))), 1315 str(cms_info.get('financialInformation', {}).get('associatedServicePrincipal', '0.0'))),
1313 (consts.SE_AFC_CON_FIELD[7], amount), 1316 (consts.SE_AFC_CON_FIELD[7], amount),
1314 (consts.SE_AFC_CON_FIELD[8], vin_no), 1317 (consts.SE_AFC_CON_FIELD[8], vin_no),
1315 (consts.SE_AFC_CON_FIELD[9], cms_info.get('dealerName', '')), 1318 (consts.SE_AFC_CON_FIELD[9], dealer_name),
1316 (consts.SE_AFC_CON_FIELD[10], 1319 (consts.SE_AFC_CON_FIELD[10],
1317 str(cms_info.get('financialInformation', {}).get('originationPrincipal', '0.0'))), 1320 str(cms_info.get('financialInformation', {}).get('originationPrincipal', '0.0'))),
1318 (consts.SE_AFC_CON_FIELD[11], vehicle_principal_str), 1321 (consts.SE_AFC_CON_FIELD[11], vehicle_principal_str),
...@@ -1368,6 +1371,9 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1368,6 +1371,9 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1368 main_role_info = {} 1371 main_role_info = {}
1369 company_info_list = [] 1372 company_info_list = []
1370 1373
1374 dealer_name_list = cms_info.get('dealerName', '').split()
1375 dealer_name = '' if len(dealer_name_list) == 0 else dealer_name_list[-1]
1376
1371 # 个人信息证件--------------------------------------------------------------------------------------------------------- 1377 # 个人信息证件---------------------------------------------------------------------------------------------------------
1372 # province = cms_info.get('province', '') 1378 # province = cms_info.get('province', '')
1373 for individual_info in cms_info.get('applicantInformation', []): 1379 for individual_info in cms_info.get('applicantInformation', []):
...@@ -1467,7 +1473,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1467,7 +1473,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1467 # 新车发票---------------------------------------------------------------------------------------------------------- 1473 # 新车发票----------------------------------------------------------------------------------------------------------
1468 if vehicle_status == 'New': 1474 if vehicle_status == 'New':
1469 vehicle_field_input.append(('vinNo', vin_no)) 1475 vehicle_field_input.append(('vinNo', vin_no))
1470 vehicle_field_input.append(('dealer', '、'.join([cms_info.get('dealerName', ''), cms_info.get('fapiaoIssuerDealer', '')]))) 1476 vehicle_field_input.append(('dealer', '、'.join([dealer_name, cms_info.get('fapiaoIssuerDealer', '')])))
1471 vehicle_field_input.append(('vehicleTransactionAmount', amount)) 1477 vehicle_field_input.append(('vehicleTransactionAmount', amount))
1472 1478
1473 if isinstance(company_info, tuple): 1479 if isinstance(company_info, tuple):
...@@ -1513,6 +1519,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1513,6 +1519,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1513 gb34_field_input.append((consts.SE_GB_USED_FIELD[2], first_submission_date)) 1519 gb34_field_input.append((consts.SE_GB_USED_FIELD[2], first_submission_date))
1514 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[2], first_submission_date)) 1520 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[2], first_submission_date))
1515 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[3], consts.SE_STAMP_VALUE)) 1521 # vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[3], consts.SE_STAMP_VALUE))
1522 jypz_field_input.append(('dealerName', dealer_name))
1516 jypz_field_input.append(('vinNo', vin_no)) 1523 jypz_field_input.append(('vinNo', vin_no))
1517 jypz_field_input.append(('vehicleTransactionAmount', amount)) 1524 jypz_field_input.append(('vehicleTransactionAmount', amount))
1518 jypz_field_input.append((consts.SE_GB_USED_FIELD[-1], first_submission_date)) 1525 jypz_field_input.append((consts.SE_GB_USED_FIELD[-1], first_submission_date))
...@@ -1712,7 +1719,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1712,7 +1719,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1712 (consts.SE_HIL_CON_1_FIELD[0], [full_no] if online_sign else full_no), 1719 (consts.SE_HIL_CON_1_FIELD[0], [full_no] if online_sign else full_no),
1713 (consts.SE_HIL_CON_1_FIELD[1], full_no), 1720 (consts.SE_HIL_CON_1_FIELD[1], full_no),
1714 (consts.SE_HIL_CON_1_FIELD[2], vin_no), 1721 (consts.SE_HIL_CON_1_FIELD[2], vin_no),
1715 (consts.SE_HIL_CON_1_FIELD[3], cms_info.get('dealerName', '')), 1722 (consts.SE_HIL_CON_1_FIELD[3], dealer_name),
1716 (consts.SE_HIL_CON_1_FIELD[4], amount), 1723 (consts.SE_HIL_CON_1_FIELD[4], amount),
1717 (consts.SE_HIL_CON_1_FIELD[5], str(cms_info.get('financialInformation', {}).get('originationPrincipal', '0.0'))), 1724 (consts.SE_HIL_CON_1_FIELD[5], str(cms_info.get('financialInformation', {}).get('originationPrincipal', '0.0'))),
1718 (consts.SE_HIL_CON_1_FIELD[6], str(cms_info.get('terms', '0'))), 1725 (consts.SE_HIL_CON_1_FIELD[6], str(cms_info.get('terms', '0'))),
...@@ -1750,7 +1757,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1750,7 +1757,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1750 (consts.SE_HIL_CON_3_FIELD[0], [full_no] if online_sign else full_no), 1757 (consts.SE_HIL_CON_3_FIELD[0], [full_no] if online_sign else full_no),
1751 (consts.SE_HIL_CON_3_FIELD[1], hmh_name), 1758 (consts.SE_HIL_CON_3_FIELD[1], hmh_name),
1752 (consts.SE_HIL_CON_3_FIELD[2], hmh_id), 1759 (consts.SE_HIL_CON_3_FIELD[2], hmh_id),
1753 (consts.SE_HIL_CON_3_FIELD[3], cms_info.get('dealerName', '')), 1760 (consts.SE_HIL_CON_3_FIELD[3], dealer_name),
1754 (consts.SE_HIL_CON_3_FIELD[4], full_no), 1761 (consts.SE_HIL_CON_3_FIELD[4], full_no),
1755 (consts.SE_HIL_CON_3_FIELD[5], hmh_name), 1762 (consts.SE_HIL_CON_3_FIELD[5], hmh_name),
1756 (consts.SE_HIL_CON_3_FIELD[6], hmh_id), 1763 (consts.SE_HIL_CON_3_FIELD[6], hmh_id),
...@@ -1799,7 +1806,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1799,7 +1806,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1799 (consts.SE_AFC_CON_FIELD[6], str(cms_info.get('financialInformation', {}).get('associatedServicePrincipal', '0.0'))), 1806 (consts.SE_AFC_CON_FIELD[6], str(cms_info.get('financialInformation', {}).get('associatedServicePrincipal', '0.0'))),
1800 (consts.SE_AFC_CON_FIELD[7], amount), 1807 (consts.SE_AFC_CON_FIELD[7], amount),
1801 (consts.SE_AFC_CON_FIELD[8], vin_no), 1808 (consts.SE_AFC_CON_FIELD[8], vin_no),
1802 (consts.SE_AFC_CON_FIELD[9], cms_info.get('dealerName', '')), 1809 (consts.SE_AFC_CON_FIELD[9], dealer_name),
1803 (consts.SE_AFC_CON_FIELD[10], str(cms_info.get('financialInformation', {}).get('originationPrincipal', '0.0'))), 1810 (consts.SE_AFC_CON_FIELD[10], str(cms_info.get('financialInformation', {}).get('originationPrincipal', '0.0'))),
1804 (consts.SE_AFC_CON_FIELD[11], vehicle_principal_str), 1811 (consts.SE_AFC_CON_FIELD[11], vehicle_principal_str),
1805 (consts.SE_AFC_CON_FIELD[12], str(cms_info.get('financialInformation', {}).get('associatedServicePrincipal', '0.0'))), 1812 (consts.SE_AFC_CON_FIELD[12], str(cms_info.get('financialInformation', {}).get('associatedServicePrincipal', '0.0'))),
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!