qrpa 1.0.97__py3-none-any.whl → 1.0.99__py3-none-any.whl

qrpa/shein_excel.py

@@ -195,7 +195,6 @@ class SheinExcel:
         dict = read_dict_from_file(cache_file)
         for store_username, shein_back_list in dict.items():
             for item in shein_back_list:
-
                 store_name = dict_store.get(store_username)
 
                 returnOrderId = item['id']
@@ -297,7 +296,6 @@ class SheinExcel:
         dict = read_dict_from_file(cache_file)
         for store_username, shein_back_list in dict.items():
             for item in shein_back_list:
-
                 store_name = dict_store.get(store_username)
 
                 returnOrderId = item['id']
@@ -393,7 +391,6 @@ class SheinExcel:
         dict = read_dict_from_file(cache_file)
         for store_username, shein_back_list in dict.items():
             for item in shein_back_list:
-
                 store_name = dict_store.get(store_username)
 
                 returnOrderId = item['id']
@@ -1209,9 +1206,9 @@ class SheinExcel:
         excel_path_month = str(self.config.excel_shein_finance_month_report).replace('#store_name#', store_name)
 
         month_data = [[
-            '平台SKU', '商家SKU', '属性集', '数量', '单价', '金额', '单价成本', '利润', '售出数量', '售出金额', '添加时间',
+            '平台SKU', '商家SKU', '属性集', '数量', '单价', '金额', '单价成本', '利润', '售出数量', '售出金额', '售出成本', '添加时间',
             '业务单号', '单据号', '变动类型', '结算类型', 'SKC', '供方货号', '供应商名称', 'SKU图片',
-        ], ['合计', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '']]
+        ], ['合计', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '']]
         log('len(ledger_list)', len(ledger_list))
         for month_item in ledger_list:
             row_item = []
@@ -1230,6 +1227,7 @@ class SheinExcel:
                 month_item['quantity'] if month_item['cost_price'] and month_item['settleTypeName'] == '收入结算' else 0)
             row_item.append(
                 month_item['amount'] if month_item['cost_price'] and month_item['settleTypeName'] == '收入结算' else 0)
+            row_item.append('')
             row_item.append(month_item['addTime'])
             row_item.append(month_item['businessNo'])
             row_item.append(month_item['billNo'])
@@ -1250,10 +1248,11 @@ class SheinExcel:
         add_borders(sheet)
         format_to_money(sheet, ['单价', '金额', '利润'])
         format_to_datetime(sheet, ['时间'])
-        add_formula_for_column(sheet, '利润', '=IF(AND(ISNUMBER(G3),O3="收入结算"),F3-G3*D3,0)', 3)
-        add_formula_for_column(sheet, '售出数量', '=IF(AND(ISNUMBER(G3),O3="收入结算"),D3,0)', 3)
-        add_formula_for_column(sheet, '售出金额', '=IF(AND(ISNUMBER(G3),O3="收入结算"),F3,0)', 3)
-        add_sum_for_cell(sheet, ['数量', '金额', '利润', '售出数量', '售出金额'])
+        add_formula_for_column(sheet, '利润', '=IF(AND(ISNUMBER(G3),P3="收入结算"),F3-G3*D3,0)', 3)
+        add_formula_for_column(sheet, '售出数量', '=IF(AND(ISNUMBER(G3),P3="收入结算"),D3,0)', 3)
+        add_formula_for_column(sheet, '售出金额', '=IF(AND(ISNUMBER(G3),P3="收入结算"),F3,0)', 3)
+        add_formula_for_column(sheet, '售出成本', '=IF(AND(ISNUMBER(G3),P3="收入结算"),D3 * G3,0)', 3)
+        add_sum_for_cell(sheet, ['数量', '金额', '利润', '售出数量', '售出金额', '售出成本'])
         column_to_left(sheet, ['平台SKU', '商家SKU', '属性集'])
         column_to_right(sheet, ['单价', '金额', '利润'])
         hidden_columns(sheet, ['SKU图片'])
@@ -1370,7 +1369,7 @@ class SheinExcel:
 
         write_dict_to_file_ex(f'{self.config.auto_dir}/shein/cache/sheet_{last_month}_补扣款列表.json', {store_username: replenish_data[:1] + replenish_data[2:]}, [store_username])
 
-        write_data(excel_path_month, sheet_name, replenish_data)
+        write_data(excel_path_month, sheet_name, sort_by_column(replenish_data, 2, 2))
 
         app, wb, sheet = open_excel(excel_path_month, sheet_name)
         set_title_style(sheet, 2)
@@ -1540,19 +1539,28 @@ class SheinExcel:
 
         target_month = find_column_by_data(sheet, 2, last_month)
         sheet.range(f'{target_month}3').value = f"='{last_month}月销售明细'!I2"
+
         sheet.range(f'{target_month}4').number_format = f"¥#,##0.00;¥-#,##0.00"
         sheet.range(f'{target_month}4').value = f"='{last_month}月销售明细'!J2"
+
+        sheet.range(f'A5').value = f"销售成本"
         sheet.range(f'{target_month}5').number_format = f"¥#,##0.00;¥-#,##0.00"
-        sheet.range(f'{target_month}5').value = f"='{last_month}月销售明细'!H2"
+        sheet.range(f'{target_month}5').value = f"='{last_month}月销售明细'!K2"
+
+        sheet.range(f'A6').value = f"销售利润"
         sheet.range(f'{target_month}6').number_format = f"¥#,##0.00;¥-#,##0.00"
+        sheet.range(f'{target_month}6').value = f"='{last_month}月销售明细'!H2"
+
+        # sheet.range(f'{target_month}6').number_format = f"¥#,##0.00;¥-#,##0.00"
         # sheet.range(f'{target_month}6').value = f"=-'{last_month}月退货与报废单列表'!L2 * 3"
         sheet.range(f'{target_month}7').number_format = f"¥#,##0.00;¥-#,##0.00"
         sheet.range(f'{target_month}7').value = f"=-'{last_month}月补扣款列表'!H2"
         sheet.range(f'{target_month}8').number_format = f"¥#,##0.00;¥-#,##0.00"
         sheet.range(f'{target_month}9').number_format = f"¥#,##0.00;¥-#,##0.00"
-        sheet.range(f'{target_month}9').value = f"=SUM({target_month}5:{target_month}8)"
+        sheet.range(f'{target_month}9').value = f"=SUM({target_month}6:{target_month}8)"
         sheet.range(f'{target_month}10').number_format = f"¥#,##0.00;¥-#,##0.00"
-        sheet.range(f'{target_month}10').value = f"='{last_month}月库存结余'!J2"
+        sheet.range(f'{target_month}10').value = f"='{last_month}月库存结余'!Q2"
+
         sheet.range('A1').value = f'2025年{last_month}月 shein 利润汇总表 {store_name}'
         sheet.range(f'{target_month}:{target_month}').autofit()
         wb.save()

qrpa/shein_mysql.py

@@ -1,62 +1,62 @@
-import json
-
-from .mysql_module.shein_return_order_model import SheinReturnOrderManager
-from .mysql_module.shein_product_model import SheinProductManager
-from .fun_base import log
-
-import os
-
-class SheinMysql:
-    def __init__(self, config):
-        self.config = config
-
-    def upsert_shein_return_order(self, json_file):
-        log(f'当前使用的数据库: {self.config.db.database_url}')
-        # 创建管理器实例
-        manager = SheinReturnOrderManager(self.config.db.database_url)
-        # 创建数据表
-        manager.create_tables()
-        # 读取JSON文件
-        with open(json_file, 'r', encoding='utf-8') as f:
-            dict = json.load(f)
-            for store_username, data_list in dict.items():
-                manager.upsert_return_order_data(store_username, data_list)
-
-    def upsert_shein_product(self, json_file):
-        log(f'当前使用的数据库: {self.config.db.database_url}')
-        # 创建管理器实例
-        manager = SheinProductManager(self.config.db.database_url)
-        # 创建数据表
-        manager.create_tables()
-        with open(json_file, 'r', encoding='utf-8') as f:
-            file_list = json.load(f)
-            for store_username, store_skc_list_file in file_list.items():
-                with open(store_skc_list_file, 'r', encoding='utf-8') as f:
-                    dict_store_skc_list = json.load(f)
-                    for store_username, data_list in dict_store_skc_list.items():
-                        manager.upsert_product_data(data_list)
-
-    def upsert_shein_product_info(self, json_file):
-        log(f'当前使用的数据库: {self.config.db.database_url}')
-        # 创建管理器实例
-        manager = SheinProductManager(self.config.db.database_url)
-        # 创建数据表
-        manager.create_tables()
-        with open(json_file, 'r', encoding='utf-8') as f:
-            file_list = json.load(f)
-            for store_username, store_spu_list in file_list.items():
-                for spu in store_spu_list:
-                    product_detail_file = f'{self.config.auto_dir}/shein/product_detail/product_detail_{spu}.json'
-                    attribute_file = f'{self.config.auto_dir}/shein/attribute/attribute_template_{spu}.json'
-                    if os.path.exists(product_detail_file):
-                        with open(product_detail_file, 'r', encoding='utf-8') as f:
-                            data_list = json.load(f)
-                            manager.upsert_product_detail(spu, 'product_detail', data_list)
-                    else:
-                        log(f'文件不存在: {product_detail_file}')
-                    if os.path.exists(attribute_file):
-                        with open(attribute_file, 'r', encoding='utf-8') as f:
-                            data_list = json.load(f)
-                            manager.upsert_product_detail(spu, 'attribute_template', data_list)
-                    else:
-                        log(f'文件不存在: {attribute_file}')
+import json
+
+from .mysql_module.shein_return_order_model import SheinReturnOrderManager
+from .mysql_module.shein_product_model import SheinProductManager
+from .fun_base import log
+
+import os
+
+class SheinMysql:
+    def __init__(self, config):
+        self.config = config
+
+    def upsert_shein_return_order(self, json_file):
+        log(f'当前使用的数据库: {self.config.db.database_url}')
+        # 创建管理器实例
+        manager = SheinReturnOrderManager(self.config.db.database_url)
+        # 创建数据表
+        manager.create_tables()
+        # 读取JSON文件
+        with open(json_file, 'r', encoding='utf-8') as f:
+            dict = json.load(f)
+            for store_username, data_list in dict.items():
+                manager.upsert_return_order_data(store_username, data_list)
+
+    def upsert_shein_product(self, json_file):
+        log(f'当前使用的数据库: {self.config.db.database_url}')
+        # 创建管理器实例
+        manager = SheinProductManager(self.config.db.database_url)
+        # 创建数据表
+        manager.create_tables()
+        with open(json_file, 'r', encoding='utf-8') as f:
+            file_list = json.load(f)
+            for store_username, store_skc_list_file in file_list.items():
+                with open(store_skc_list_file, 'r', encoding='utf-8') as f:
+                    dict_store_skc_list = json.load(f)
+                    for store_username, data_list in dict_store_skc_list.items():
+                        manager.upsert_product_data(data_list)
+
+    def upsert_shein_product_info(self, json_file):
+        log(f'当前使用的数据库: {self.config.db.database_url}')
+        # 创建管理器实例
+        manager = SheinProductManager(self.config.db.database_url)
+        # 创建数据表
+        manager.create_tables()
+        with open(json_file, 'r', encoding='utf-8') as f:
+            file_list = json.load(f)
+            for store_username, store_spu_list in file_list.items():
+                for spu in store_spu_list:
+                    product_detail_file = f'{self.config.auto_dir}/shein/product_detail/product_detail_{spu}.json'
+                    attribute_file = f'{self.config.auto_dir}/shein/attribute/attribute_template_{spu}.json'
+                    if os.path.exists(product_detail_file):
+                        with open(product_detail_file, 'r', encoding='utf-8') as f:
+                            data_list = json.load(f)
+                            manager.upsert_product_detail(spu, 'product_detail', data_list)
+                    else:
+                        log(f'文件不存在: {product_detail_file}')
+                    if os.path.exists(attribute_file):
+                        with open(attribute_file, 'r', encoding='utf-8') as f:
+                            data_list = json.load(f)
+                            manager.upsert_product_detail(spu, 'attribute_template', data_list)
+                    else:
+                        log(f'文件不存在: {attribute_file}')

qrpa/shein_ziniao.py

@@ -153,8 +153,8 @@ class ZiniaoBrowser:
         self.config = config
 
     def open_store(self, store_info: str, isWebDriverReadOnlyMode: int = 0,
-            isprivacy: int = 0, isHeadless: int = 0,
-            cookieTypeSave: int = 0, jsInfo: str = "") -> Dict[str, Any]:
+                   isprivacy: int = 0, isHeadless: int = 0,
+                   cookieTypeSave: int = 0, jsInfo: str = "") -> Dict[str, Any]:
         """打开店铺"""
         request_id = str(uuid.uuid4())
         data = {
@@ -272,7 +272,7 @@ class ZiniaoTaskManager:
         self.browser = browser
         self.config = config
 
-    def daily_cleanup_superbrowser(self, browser_id):
+    def daily_cleanup_superbrowser(self, browser_id, force=False):
         """
         每天删除一次SuperBrowser缓存文件夹
 
@@ -318,7 +318,7 @@ class ZiniaoTaskManager:
                 log(f"读取标志文件时出错: {e}")
                 # 如果读取出错，继续执行清理
 
-        if need_cleanup:
+        if need_cleanup or force:
             try:
                 # 删除目标文件夹
                 log(f"正在删除文件夹: {target_folder}")
@@ -340,10 +340,10 @@ class ZiniaoTaskManager:
         return True
 
     def run_single_store_task(self, browser_info: Dict[str, Any],
-            run_func: Callable, task_key: str,
-            just_store_username: Optional[List[str]] = None,
-            is_skip_store: Optional[Callable] = None
-    ):
+                              run_func: Callable, task_key: str,
+                              just_store_username: Optional[List[str]] = None,
+                              is_skip_store: Optional[Callable] = None
+                              ):
         """运行单个店铺的任务"""
         store_id = browser_info.get('browserOauth')
         store_name = browser_info.get("browserName")
@@ -420,24 +420,25 @@ class ZiniaoTaskManager:
                     break
             except:
                 send_exception(f'第{retry_count}次运行失败，准备重新打开店铺: {store_username},{store_name},{store_id}')
+                self.daily_cleanup_superbrowser(browser_id)
                 if retry_count > 5:
                     break
 
     def run_all_stores_task(self, browser_list: List[Dict[str, Any]],
-            run_func: Callable, task_key: str,
-            just_store_username: Optional[List[str]] = None,
-            is_skip_store: Optional[Callable] = None
-    ):
+                            run_func: Callable, task_key: str,
+                            just_store_username: Optional[List[str]] = None,
+                            is_skip_store: Optional[Callable] = None
+                            ):
         """循环运行所有店铺的任务"""
         for browser_info in browser_list:
             self.run_single_store_task(browser_info, run_func, task_key, just_store_username, is_skip_store)
 
     def run_with_thread_pool(self, browser_list: List[Dict[str, Any]],
-            max_threads: int = 3, run_func: Callable = None,
-            task_key: str = None,
-            just_store_username: Optional[List[str]] = None,
-            is_skip_store: Optional[Callable] = None
-    ):
+                             max_threads: int = 3, run_func: Callable = None,
+                             task_key: str = None,
+                             just_store_username: Optional[List[str]] = None,
+                             is_skip_store: Optional[Callable] = None
+                             ):
         """使用线程池控制最大并发线程数运行任务"""
         with ThreadPoolExecutor(max_workers=max_threads) as executor:
             task = partial(self.run_single_store_task,
@@ -460,14 +461,14 @@ class ZiniaoRunner:
         self.task_manager = ZiniaoTaskManager(self.browser, config)
 
     def execute(self, run_prepare: Optional[Callable] = None,
-            run: Optional[Callable] = None,
-            run_summary: Optional[Callable] = None,
-            run_notify: Optional[Callable] = None,
-            task_key: Optional[str] = None,
-            just_store_username: Optional[List[str]] = None,
-            is_skip_store: Optional[Callable] = None,
-            platform_name: Optional[str] = "SHEIN-全球",
-    ):
+                run: Optional[Callable] = None,
+                run_summary: Optional[Callable] = None,
+                run_notify: Optional[Callable] = None,
+                task_key: Optional[str] = None,
+                just_store_username: Optional[List[str]] = None,
+                is_skip_store: Optional[Callable] = None,
+                platform_name: Optional[str] = "SHEIN-全球",
+                ):
         """主执行入口"""
         # 前置执行 if run_prepare:
         run_prepare()