part 1

@@ -1021,6 +1021,8 @@ JYPZ_FIELD_ORDER = (("type", "标题"),
 CONTRACT_CN_NAME = '合同'
 CONTRACT_CLASSIFY = 41
 
+# 合同编号: 每页
+
 HIL_CONTRACT_1_CN_NAME = '售后回租合同'
 HIL_CONTRACT_1_CLASSIFY = 43
 
@@ -1379,15 +1381,49 @@ SE_CORPORATE_ALL_FIELD = ['companyName', 'legalRepName', 'firstIdNo', 'businessL
                           'taxRegistrationCertificateNo', 'establishmentDate', 'businessLicenseDueDate']
 SE_NEW_FIELD = ['vinNo', 'dealer', 'vehicleTransactionAmount']
 SE_USED_FIELD = ['vinNo', 'vehicleTransactionAmount']
-SE_NEW_ADD_FIELD = ['customerName', 'idNum', 'dateOfInvoice', 'stamp']
+SE_NEW_ADD_FIELD = ['customerName', 'idNum', 'dateOfInvoice', 'stamp', '发票联', '发票真伪校验']
+SE_FPL_VALUE = '发票联'
 SE_STAMP_VALUE = '有'
 SE_GB_NEW_FIELD = ['vinNo']
 SE_GB_USED_FIELD = ['customerName', 'idNum', 'date']
-SE_HMH_FIELD = ['customerName', 'idNum', 'applicationId']
+SE_HMH_FIELD = ['借款人/承租人姓名', '借款人/承租人证件号', '申请号', '渠道', '签字']
 
 SE_BANK_FIELD = ['accountNo', 'bankName']
 SE_DDA_FIELD = ['applicationId(1)', 'applicationId(2)', 'bankName', 'companyName', 'customerName', 'idNum', 'accountHolderName', 'accountNo']
 
+SE_AFC_CON_FIELD = ['合同编号-每页', '所购车辆价格-小写-重要条款', '车架号-重要条款', '贷款本金金额-重要条款', '贷款期限-重要条款',
+                    '车辆贷款本金金额-重要条款', '附加产品融资贷款本金总额-重要条款', '所购车辆价格', '车架号', '经销商',
+                    '贷款本金金额', '车辆贷款本金金额', '附加产品融资贷款本金总额', '贷款期限', '还款账号', '户名', '开户行',
+                    '还款计划表', '项目1', '用途总金额', '贷款本金', '附加产品融资贷款本金总金额', '购置税校验']
+#
+# '借款人签字-重要条款'
+# '借款人姓名'
+# '借款人证件号'
+# '主借人签字'
+# '主借人日期'
+#
+# '共借人姓名'
+# '共借人证件号'
+# '共借人签字'
+# '共借人日期'
+#
+# '保证人姓名1'
+# '保证人证件号1'
+# '保证人签字1'
+# '保证人日期'
+#
+# '保证人姓名2'
+# '保证人证件号2'
+# '保证人签字2'
+# '保证人日期'
+#
+# '见证人签字'
+# '见证人日期'
+
+GZS_NAME = '车辆购置税'
+GZS_STATUS = ['Y', 'N', 'O']
+SCHEDULE_SPLIT_STR = '、'
+
 HIL_COMPANY_NAME = '先锋国际融资租赁有限公司'
 AFC_COMPANY_NAME = '宝马汽车金融(中国)有限公司'
 
@@ -1404,6 +1440,7 @@ BC_EN = 'Bank Card'
 DDA_EN = 'DDA'
 HMH_EN = 'Mortgage Waiver Letter'
 JYPZ_EN = 'Used Car Document'
+AFC_CONTRACT_EN = 'AFC Contract'
 
 SKIP_CARD = {ID_EN, RP_EN}
 
@@ -1411,10 +1448,11 @@ SKIP_CARD = {ID_EN, RP_EN}
 ID_COMPARE_LOGIC = {
     'customerName': ('姓名', 'se_name_compare', {}),
     'idNum': ('公民身份号码', 'se_common_compare', {}),
-    'dateOfBirth': ('出生年月', 'se_date_compare', {'input_replace': ''}),
+    # 'dateOfBirth': ('出生年月', 'se_date_compare', {'input_replace': ''}),
     'idExpiryDate': ('有效期限', 'se_date_compare', {'long': True, 'ocr_split': True, 'input_replace': '', 'today': True}),
     'hukouProvince': ('住址', 'se_contain_compare', {}),
     'hukouCity': ('住址', 'se_contain_compare', {}),
+    IC_TURE_OR_FALSE: (IC_TURE_OR_FALSE, 'se_common_compare', {}),
 }
 
 PP_COMPARE_LOGIC = {
@@ -1463,13 +1501,20 @@ BL_COMPARE_LOGIC = {
 
 MVI_COMPARE_LOGIC = {
     'vinNo': ('车辆识别代码', 'se_common_compare', {}),
-    'dealer': ('销方名称', 'se_common_compare', {}),
+    'dealer': ('销方名称', 'se_contain_compare_2', {}),
     'vehicleTransactionAmount': ('价税合计小写', 'se_amount_compare', {}),
-    'customerName': ('购方名称', 'se_name_compare', {'is_passport': True}),
-    'idNum': ('购买方身份证号或组织机构代码', 'se_contain_compare_2', {}),
+    'customerName': ('购方名称', 'se_common_compare', {}),
+    'idNum': ('购买方身份证号或组织机构代码', 'se_common_compare', {}),
     'dateOfInvoice': ('开票日期', 'se_date_compare_2', {'three_month': True}),
     'stamp': ('销售单位章', 'se_common_compare', {}),
+    '发票联': ('发票类型', 'se_common_compare', {}),
+    '发票真伪校验': ('发票真伪校验', 'se_common_compare', {}),
 }
+ZW_METHOD = 'mvi_special'
+LOWER_AMOUNT_FIELD = '价税合计小写'
+UPPER_AMOUNT_FIELD = '价税合计大写'
+BHSJ_FIELD = '不含税价'
+ZZSSE_FIELD = '增值税税额'
 
 UCI_COMPARE_LOGIC = {
     'vinNo': ('车架号', 'se_common_compare', {}),
@@ -1497,9 +1542,11 @@ MVC34_COMPARE_LOGIC = {
     'date': (TRANSFER_DATE, 'se_date_compare_2', {}),
 }
 
+BC_TYPE_VALUE = '借记卡'
 BC_COMPARE_LOGIC = {
     'accountNo': ('CardNum', 'se_common_compare', {'remove_space': True}),
     'bankName': ('BankName', 'se_both_contain_compare', {}),
+    'type': ('CardType', 'se_common_compare', {}),
 }
 
 DDA_COMPARE_LOGIC = {
@@ -1522,9 +1569,11 @@ JYPZ_COMPARE_LOGIC = {
 }
 
 HMH_COMPARE_LOGIC = {
-    'customerName': ('借款/承租人姓名', 'se_name_compare', {}),
-    'idNum': ('证件号码', 'se_common_compare', {}),
-    'applicationId': ('合同编号', 'se_contain_compare', {}),
+    '借款人/承租人姓名': ('借款/承租人姓名', 'se_name_compare', {}),
+    '借款人/承租人证件号': ('证件号码', 'se_common_compare', {}),
+    '申请号': ('合同编号', 'se_common_compare', {}),
+    '渠道': ('渠道', 'se_common_compare', {}),
+    '签字': ('借款人签字/盖章', 'se_common_compare', {}),
 }
 
 # MVC_OCR_FIELD = 'mvc_ocr'

@@ -16,6 +16,7 @@ class Comparison:
         self.CSIBM = 'CSIBM'
         self.CSSME = 'CSSME'
         self.CSOTH = 'CSOTH'
+        self.SPLIT_STR = '_'
 
         self.TYPE_MAPPING = (
             (r'个体工商户', self.CSIBM),
@@ -109,6 +110,16 @@ class Comparison:
                 ocr_output = None
         return self.build_res(input_str == ocr_str), ocr_output
 
+    def mvi_special(self, amount_lower_str, amount_upper_str, bhsj_str, zzsse_str):
+        # 不含税价, 增值税税额
+        try:
+            if float(amount_lower_str) != rmb_handler.to_rmb_lower(amount_upper_str):
+                return self.RESULT_N
+        except Exception:
+            return self.RESULT_N
+        else:
+            return self.SPLIT_STR.join([bhsj_str, zzsse_str, self.RESULT_Y])
+
     def rmb_compare(self, input_str, ocr_str, idx, **kwargs):
         if not isinstance(ocr_str, str) or not isinstance(input_str, str):
             return self.RESULT_NA, None
@@ -198,7 +209,7 @@ class Comparison:
         )
         dti = DatetimeIndex(dt_array, tz=None, name=None)
         ts = dti[0]
-        if isinstance(ts, NaTType) or ts.date() < datetime.today().date():
+        if isinstance(ts, NaTType) or ts.date() < (datetime.today() + relativedelta(days=8)).date():
             return False
         else:
             return True