Merge branch 'feature/e-bank'

@@ -379,6 +379,13 @@ HEADERS_MAPPING.update(
     }
 )
 
+# 48
+HEADERS_MAPPING.update(
+    {
+        '商品说明': SUMMARY_KEY,
+    }
+)
+
 # ----------针式打印-部分格线------------------------------------------------------------------------------------------
 # 竖版-特殊-邮储银行-一本通绿卡通交易明细(客户)
 # 竖版-特殊-邮储银行-账户交易明细(客户)
@@ -524,6 +531,10 @@ OTHER_TUPLE = (None, None, None, None, None, None, None, None, None, None, None,
 #     "35":"针式打印-部分格线-竖版-邮储银行",
 #     "36":"针式打印-部分格线-竖版-邮储银行-绿卡",
 
+#     "46":"中国农业银行账户活期交易明细清单",
+#     "47":"平安银行个人账户交易明细清单-版式二",
+#     "48":"支付宝收支明细证明",
+
 #     "50":"普通打印-无格线-农业银行-整数-特殊",
 
 CLASSIFY_LIST = [
@@ -575,9 +586,11 @@ CLASSIFY_LIST = [
     ('其他', OTHER_TUPLE),
     ('其他', OTHER_TUPLE),
     ('其他', OTHER_TUPLE),
-    ('其他', OTHER_TUPLE),
-    ('其他', OTHER_TUPLE),
-    ('其他', OTHER_TUPLE),
+
+    ('中国农业银行账户活期交易明细清单', (1, 2, 4, 5, None, 3, 6, None, None, None, None, None, None)),
+    ('平安银行个人账户交易明细清单-版式二', (2, None, 3, 4, None, 5, None, 6, None, None, None, None, None)),
+    ('支付宝收支明细证明', (8, None, 5, None, None, 3, 2, None, None, None, 1, None, None)),
+
     ('其他', OTHER_TUPLE),
 
     ('普通打印-无格线-农业银行-整数-特殊', (1, None, 3, 4, None, 2, None, 5, None, None, None, None, None)),
@@ -632,9 +645,11 @@ CLASSIFY_HEADER_LIST = [
     OTHER_TUPLE,
     OTHER_TUPLE,
     OTHER_TUPLE,
-    OTHER_TUPLE,
-    OTHER_TUPLE,
-    OTHER_TUPLE,
+
+    ('交易日期', '交易时间', '交易摘要', '交易金额', '本次余额', '对手信息', '交易渠道', '交易附言'),
+    ('序号', '交易时间', '交易金额', '余额', '摘要', '交易对手信息'),
+    ('收/支', '交易对方', '商品说明', '收/付款方式', '金额', '交易订单号', '商家订单号', '交易时间'),
+
     OTHER_TUPLE,
 
     ('交易日期', '摘要/附言', '交易金额', '账户余额', '对方账号和户名'),
@@ -1121,14 +1136,16 @@ SPECIAL_NYZS_CLASSIFY = 50
 MS_CLASSIFY = 21
 MS_ERROR_COL = (5, 6)
 WECHART_CLASSIFY = 12
+NEW_ZHIFUBAO_CLASSIFY = 48
 ALI_WECHART_CLASSIFY = {12, 13}
 WECHART_ERROR_COL = (1, 2)
-WECHART_HEADERS_MAPPING = copy.deepcopy(HEADERS_MAPPING)
-WECHART_HEADERS_MAPPING.update(
+SPECIAL_HEADERS_MAPPING = copy.deepcopy(HEADERS_MAPPING)
+SPECIAL_HEADERS_MAPPING.update(
     {
         '交易时间': DATE_KEY,
     }
 )
+SPECIAL_HEADERS_CLASSIFY_SET = {WECHART_CLASSIFY, 47, 48}
 
 PATTERN_LIST = ['联机金额', '交易名称', '收入/支出金额', '收入', '存入', '支出', '支取', '金额', '余额', '发生额', '借贷',
                 '借贷状态', '收支标志', '收/支', '收入金额', '存入金额（贷）', '存入金额(贷)', '支出金额', '支取金额（借）',

@@ -61,8 +61,8 @@ class BSWorkbook(Workbook):
     def get_header_col(header_value, classify):
         if header_value is None:
             return
-        if classify == consts.WECHART_CLASSIFY:
-            header_dict = consts.WECHART_HEADERS_MAPPING
+        if classify in consts.SPECIAL_HEADERS_CLASSIFY_SET:
+            header_dict = consts.SPECIAL_HEADERS_MAPPING
         else:
             header_dict = consts.HEADERS_MAPPING
         header_col = header_dict.get(header_value)
@@ -118,6 +118,8 @@ class BSWorkbook(Workbook):
         find_count = len(header_col_list)
         if find_count < 2:
             find_count = 0
+        # elif classify == consts.NEW_ZHIFUBAO_CLASSIFY and find_count < 3:
+        #     find_count = 0
         else:
              for idx, header_col in header_col_list:
                 sheet_header_info.setdefault(ws.title, {}).setdefault(header_col, idx)
@@ -148,7 +150,7 @@ class BSWorkbook(Workbook):
                                   key=lambda x: sheet_header_info[x][consts.FIND_COUNT_KEY])
         best_sheet_info = sheet_header_info.get(sheet_order_list[0])
         max_find_count = best_sheet_info.get(consts.FIND_COUNT_KEY, 0)
-        if max_find_count == 0:
+        if max_find_count == 0 or classify == consts.NEW_ZHIFUBAO_CLASSIFY:
             if special_nhzs:
                 classify = consts.SPECIAL_NYZS_CLASSIFY
             for key, value in consts.CLASSIFY_MAP.items():