fix vino

@@ -1194,8 +1194,9 @@ UC_ORDER = ('vinNo', 'manufactureDate', 'firstRegistrationDate')
 CO_ORDER = ('customerType', 'customerChineseName', 'legalRepName', 'idNum', 'businessLicenseNo', 'taxRegistrationCode',
             'incorporationDate', 'businessLicenseDueDate', 'capitalRegAmount')
 
-PREFIX_MVC = 'GB'
-PREFIX_DL = 'DL'
+PREFIX_MVC = 'G'
+PREFIX_DL = 'V'
+SPLIT = ';'
 
 # --------------- DDA 保存图片 --------------------
 DDA_FIELD = 'DDA'

@@ -261,39 +261,27 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id):
             dl_find, dl_vinos = usedcar_info_compare(order_usedcar_info, ocr_res_dict, consts.DL_OCR_FIELD,
                                                      consts.PCUSD_DL, res_set)
 
-            # if mvc_find is True and dl_find is False:
-            #     vino = dl_vinos[-1] if len(dl_vinos) > 0 else ''
-            #     order_usedcar_info[consts.PCUSD_MVC[0][0]] = '{0}: {1}'.format(consts.PREFIX_MVC, vino)
-            #     order_usedcar_info[consts.PCUSD_MVC[0][4]] = consts.RESULT_N
-            # elif mvc_find is False and dl_find is True:
-            #     vino = mvc_vinos[-1] if len(mvc_vinos) > 0 else ''
-            #     order_usedcar_info[consts.PCUSD_MVC[0][0]] = '{0}: {1}'.format(consts.PREFIX_DL, vino)
-            #     order_usedcar_info[consts.PCUSD_MVC[0][4]] = consts.RESULT_N
-            # elif mvc_find is False and dl_find is False:
-            #     vino_list = []
-            #     mvc_vino = mvc_vinos[-1] if len(mvc_vinos) > 0 else ''
-            #     dl_vino = dl_vinos[-1] if len(dl_vinos) > 0 else ''
-            #     vino_list.append('{0}: {1}'.format(consts.PREFIX_MVC, mvc_vino))
-            #     vino_list.append(dl_vinos[-1])
-            #     vino = '、'.join('{0}: {1}'.format(consts.PREFIX_DL, dl_vino))
-            #     order_usedcar_info[consts.PCUSD_MVC[0][0]] = vino
-
             if mvc_find is True and dl_find is False:
-                vino = dl_vinos[0] if len(dl_vinos) > 0 else ''
-                order_usedcar_info[consts.PCUSD_MVC[0][0]] = vino
+                vino = dl_vinos[-1] if len(dl_vinos) > 0 else ''
+                order_usedcar_info[consts.PCUSD_MVC[0][0]] = '{0}-{1} {2} {3}-{4}'.format(
+                    consts.PREFIX_MVC, consts.RESULT_Y, consts.SPLIT, consts.PREFIX_DL, vino)
                 order_usedcar_info[consts.PCUSD_MVC[0][4]] = consts.RESULT_N
             elif mvc_find is False and dl_find is True:
-                vino = mvc_vinos[0] if len(mvc_vinos) > 0 else ''
-                order_usedcar_info[consts.PCUSD_MVC[0][0]] = vino
+                vino = mvc_vinos[-1] if len(mvc_vinos) > 0 else ''
+                order_usedcar_info[consts.PCUSD_MVC[0][0]] = '{0}-{1} {2} {3}-{4}'.format(
+                    consts.PREFIX_MVC, vino, consts.SPLIT, consts.PREFIX_DL, consts.RESULT_Y)
                 order_usedcar_info[consts.PCUSD_MVC[0][4]] = consts.RESULT_N
             elif mvc_find is False and dl_find is False:
-                vino_list = []
-                if len(mvc_vinos) > 0:
-                    vino_list.append(mvc_vinos[0])
-                if len(dl_vinos) > 0:
-                    vino_list.append(dl_vinos[0])
-                vino = '、'.join(vino_list)
+                if len(mvc_vinos) == 0 and len(dl_vinos) == 0:
+                    order_usedcar_info[consts.PCUSD_MVC[0][0]] = None
+                    order_usedcar_info[consts.PCUSD_MVC[0][4]] = consts.RESULT_NA
+                else:
+                    mvc_vino = mvc_vinos[-1] if len(mvc_vinos) > 0 else ''
+                    dl_vino = dl_vinos[-1] if len(dl_vinos) > 0 else ''
+                    vino = '{0}-{1} {2} {3}-{4}'.format(
+                        consts.PREFIX_MVC, mvc_vino, consts.SPLIT, consts.PREFIX_DL, dl_vino)
                     order_usedcar_info[consts.PCUSD_MVC[0][0]] = vino
+                    order_usedcar_info[consts.PCUSD_MVC[0][4]] = consts.RESULT_N
 
             comparison_res['OCR_Input']['usedCarInfo'] = order_usedcar_info