From fab36a8ee3f526175e4058eb5aa154ece58508c4 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 24 十月 2023 18:16:55 +0800
Subject: [PATCH] bug修复

---
 utils/data_export_util.py |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/utils/data_export_util.py b/utils/data_export_util.py
index fa26cd3..f036bec 100644
--- a/utils/data_export_util.py
+++ b/utils/data_export_util.py
@@ -161,7 +161,7 @@
                 cancel_order_info = trade_info[2]
         format_data.append(cancel_order_info)
         format_data.append(data["val"].get("orderNo"))
-        fdatas.append((style_int, format_data))
+        fdatas.append((style_int, trade_info, format_data))
     return fdatas
 
 
@@ -179,21 +179,31 @@
     ws.write(0, 6, '绫诲瀷')
     ws.write(0, 7, '閲嶅鏁伴噺')
     ws.write(0, 8, '鎾ゅ崟鏃堕棿')
-    ws.write(0, 9, '璁㈠崟鍙�')
+    ws.write(0, 9, '澶囨敞')
+    ws.write(0, 10, '璁㈠崟鍙�')
     index = 0
-    font = xlwt.Font()
 
     cancel_style = xlwt.easyxf('pattern: pattern solid, fore_colour gray25')
     for fdata in fdatas:
         index += 1
         style_int = fdata[0]
-        data = fdatas[1]
+        trade_info = fdata[1]
+        data = fdata[2]
         style = None
         if style_int == 0:
             style = xlwt.easyxf('pattern: pattern solid')
         else:
             style = xlwt.easyxf('pattern: pattern solid, fore_colour light_yellow')
+        font = xlwt.Font()
         style.font = font
+
+        if trade_info:
+            if trade_info[0] == 0:
+                font.colour_index = 53
+            elif trade_info[0] == 1:
+                font.colour_index = 17
+            elif trade_info[0] == 2:
+                font.colour_index = 10
 
         for i in range(len(data)):
             if data[i] is None:
@@ -255,6 +265,6 @@
 
 if __name__ == "__main__":
     try:
-        export_l2_excel("600476")
+        export_l2_excel("000010")
     except Exception as e:
         logging.exception(e)

--
Gitblit v1.8.0