merge

@@ -72,6 +72,8 @@ import time
 from django.http import HttpResponse
 from django.http import HttpResponse
 from django.utils.encoding import escape_uri_path
 from django.utils.encoding import escape_uri_path
 from PIL import Image
 from PIL import Image
+from django.http import HttpResponse
+from django.utils.encoding import escape_uri_path
 
 
 
 
 class CustomDate(fields.Date):
 class CustomDate(fields.Date):

@@ -2424,7 +2424,8 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type, allow_
                 # 只有电子流水，以电子为准
                 # 只有电子流水，以电子为准
                 reason = reason_n1
                 reason = reason_n1
                 result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N
                 result = consts.RESULT_Y if all(auto_elec_verify_list) else consts.RESULT_N
-            elif not auto_elec_verify_list:
+            elif not auto_elec_verify_list and auto_paper_verify_list:
+                # 只有纸质流水
                 paperTrue = len(auto_paper_verify_false_idx_list) <= 0
                 paperTrue = len(auto_paper_verify_false_idx_list) <= 0
                 paperNotClear = len(auto_paper_verify_true_idx_list) > 0
                 paperNotClear = len(auto_paper_verify_true_idx_list) > 0
                 if not paperTrue and paperNotClear:
                 if not paperTrue and paperNotClear:
@@ -2434,6 +2435,9 @@ def se_bs_compare(license_en, ocr_res_dict, strip_list, is_auto, aa_type, allow_
                 elif not paperTrue:
                 elif not paperTrue:
                     reason = reason_n3
                     reason = reason_n3
                 result = consts.RESULT_N
                 result = consts.RESULT_N
+            else:
+                result = consts.RESULT_N
+                reason = '高风险经销商流水类型异常'
             result_field_list.append((name, empty_str, result, json.dumps(verify_list, ensure_ascii=False), empty_str, empty_error_type, reason))
             result_field_list.append((name, empty_str, result, json.dumps(verify_list, ensure_ascii=False), empty_str, empty_error_type, reason))
 
 
         if all_zhifubao_weixin:
         if all_zhifubao_weixin: