fix amount

@@ -41,13 +41,15 @@ TRANS_MAP = {
     'C': "0",
     'C': "0",
     'c': "0",
     'c': "0",
     '(': "0",
     '(': "0",
-    '（': "0",
     'o': "0",
     'o': "0",
     'O': "0",
     'O': "0",
     'D': "0",
     'D': "0",
+
     '[': "1",
     '[': "1",
+    ']': "1",
     'l': "1",
     'l': "1",
     'L': "1",
     'L': "1",
+
     'A': "4",
     'A': "4",
     's': "5",
     's': "5",
     'S': "5",
     'S': "5",
@@ -57,6 +59,7 @@ TRANS_MAP = {
     'B': "13",
     'B': "13",
 }
 }
 TRANS = str.maketrans(TRANS_MAP)
 TRANS = str.maketrans(TRANS_MAP)
+ERROR_CHARS = {'.', '·', '•'}
 
 
 CARD_RATIO = 0.9
 CARD_RATIO = 0.9
 UNKNOWN_CARD = '未知卡号'
 UNKNOWN_CARD = '未知卡号'

@@ -458,7 +458,6 @@ class Command(BaseCommand, LoggerMixin):
                 pdf_handler.extract_image()
                 pdf_handler.extract_image()
                 self.cronjob_log.info('{0} [pdf to img end] [business_type={1}] [doc_id={2}]'.format(
                 self.cronjob_log.info('{0} [pdf to img end] [business_type={1}] [doc_id={2}]'.format(
                     self.log_base, business_type, doc.id))
                     self.log_base, business_type, doc.id))
-                write_zip_file(img_save_path, os.path.join(doc_data_path, '{0}_img.zip'.format(doc.id)))
 
 
                 # 4.获取OCR结果并且构建excel文件
                 # 4.获取OCR结果并且构建excel文件
                 bs_summary = {}
                 bs_summary = {}
@@ -514,6 +513,8 @@ class Command(BaseCommand, LoggerMixin):
                     speed_time = int(end_time - start_time)
                     speed_time = int(end_time - start_time)
                     self.cronjob_log.error('{0} [upload failed] [business_type={1}] [doc_id={2}] [speed_time={3}] '
                     self.cronjob_log.error('{0} [upload failed] [business_type={1}] [doc_id={2}] [speed_time={3}] '
                                            '[err={4}]'.format(self.log_base, business_type, doc.id, speed_time, e))
                                            '[err={4}]'.format(self.log_base, business_type, doc.id, speed_time, e))
+                    write_zip_file(img_save_path, os.path.join(doc_data_path, '{0}_img.zip'.format(doc.id)))
+
                 else:
                 else:
                     doc.status = DocStatus.COMPLETE.value
                     doc.status = DocStatus.COMPLETE.value
                     doc.save()
                     doc.save()
@@ -521,5 +522,6 @@ class Command(BaseCommand, LoggerMixin):
                     speed_time = int(end_time - start_time)
                     speed_time = int(end_time - start_time)
                     self.cronjob_log.info('{0} [process complete] [business_type={1}] [doc_id={2}] '
                     self.cronjob_log.info('{0} [process complete] [business_type={1}] [doc_id={2}] '
                                           '[speed_time={3}]'.format(self.log_base, business_type, doc.id, speed_time))
                                           '[speed_time={3}]'.format(self.log_base, business_type, doc.id, speed_time))
+                    write_zip_file(img_save_path, os.path.join(doc_data_path, '{0}_img.zip'.format(doc.id)))
 
 
         self.cronjob_log.info('{0} [stop safely]'.format(self.log_base))
         self.cronjob_log.info('{0} [stop safely]'.format(self.log_base))

@@ -207,11 +207,20 @@ class BSWorkbook(Workbook):
     def amount_format(amount_str):
     def amount_format(amount_str):
         if not isinstance(amount_str, str) or amount_str == '':
         if not isinstance(amount_str, str) or amount_str == '':
             return amount_str
             return amount_str
-        # 替换
+        # 1.替换
         res_str = amount_str.translate(consts.TRANS)
         res_str = amount_str.translate(consts.TRANS)
-        # 删除多余的-
+        # 2.删除多余的-
         res_str = res_str[0] + res_str[1:].replace('-', '')
         res_str = res_str[0] + res_str[1:].replace('-', '')
-        # TODO 逗号与句号处理
+        # 3.首字符处理
+        if res_str[0] in consts.ERROR_CHARS:
+            res_str = '-{0}'.format(res_str[1:])
+        # 4.逗号与句号处理
+        if len(res_str) >= 4:
+            period_idx = len(res_str) - 3
+            if res_str[period_idx] == '.' and res_str[period_idx - 1] == ',':
+                res_str = '{0}{1}'.format(res_str[:period_idx - 1], res_str[period_idx:])
+            elif res_str[period_idx] == ',':
+                res_str = '{0}.{1}'.format(res_str[:period_idx], res_str[period_idx + 1:])
         return res_str
         return res_str
 
 
     def build_month_sheet(self, card, month_mapping, ms, is_reverse):
     def build_month_sheet(self, card, month_mapping, ms, is_reverse):