qrpa 1.1.7__tar.gz → 1.1.9__tar.gz

{qrpa-1.1.7 → qrpa-1.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.1.7
+Version: 1.1.9
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>

{qrpa-1.1.7 → qrpa-1.1.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qrpa"
-version = "1.1.7"
+version = "1.1.9"
 description = "qsir's rpa library"
 authors = [{ name = "QSir", email = "1171725650@qq.com" }]
 readme = "README.md"

{qrpa-1.1.7 → qrpa-1.1.9}/qrpa/shein_excel.py

@@ -18,16 +18,25 @@ class SheinExcel:
     def write_sku_not_found(self):
         cache_file = f'{self.config.auto_dir}/shein/dict/sku_not_found.json'
         dict_sku_not_found = read_dict_from_file(cache_file)
+
+        excel_data = []
+        for store_username, data_list in dict_sku_not_found.items():
+            excel_data += data_list
+
         sheet_name1 = '未匹配SKU_需运营调整'
         operations = [
-            [sheet_name1, 'write', [['店铺账户', '店铺别名', '店长', 'SPU', 'SKC', '商家SKC', '商家SKU']] + dict_sku_not_found],
+            [sheet_name1, 'write', [['店铺账户', '店铺别名', '店长', 'SPU', 'SKC', '商家SKC', '商家SKU']] + excel_data],
             [sheet_name1, 'format', self.format_sku_not_found],
             ['Sheet1', 'delete'],
         ]
         cache_file = f'{self.config.auto_dir}/shein/dict/sku_to_skc.json'
         sku_to_skc = read_dict_from_file(cache_file)
+        excel_data = []
+        for store_username, data_list in sku_to_skc.items():
+            excel_data += data_list
+
         sheet_name = 'sku到skc映射'
-        operations.append([sheet_name, 'write', [['商家SKU', '商家SKC']] + sku_to_skc])
+        operations.append([sheet_name, 'write', [['商家SKU', '商家SKC']] + excel_data])
         operations.append([sheet_name, 'format', self.format_sku_to_skc])
 
         operations.append([sheet_name1, 'move', 1])
@@ -51,15 +60,18 @@ class SheinExcel:
         info = read_dict_from_file_ex(cache_file, store_username)
         return info['supplier_name']
 
-    def write_withdraw_report_2024(self):
-        excel_path = create_file_path(self.config.excel_withdraw_2024)
+    def write_withdraw_report_2024(self, year=2024):
+        if year == 2025:
+            excel_path = create_file_path(self.config.excel_withdraw_2025)
+        else:
+            excel_path = create_file_path(self.config.excel_withdraw_2024)
         dict_store = read_dict_from_file(self.config.shein_store_alias)
 
         header = ['店铺名称', '店铺账号', '供应商名称', '交易单号', '提现时间', '提现成功时间', '更新时间', '提现明细单号',
                   '收款帐户', '收款帐户所在地', '净金额', '保证金', '手续费', '汇率', '收款金额', '提现状态']
         summary_excel_data = [header]
         # 先读取提现明细列表写入
-        first_day, last_day = TimeUtils.get_year_range_time(2024)
+        first_day, last_day = TimeUtils.get_year_range_time(year)
         cache_file = f'{self.config.auto_dir}/shein/cache/withdraw_list_{first_day}_{last_day}.json'
         dict_withdraw = read_dict_from_file(cache_file)
         account_list = []
@@ -106,7 +118,7 @@ class SheinExcel:
             row_item.append('')
             summary_excel_data.append(row_item)
 
-        sheet_name = '汇总2024'
+        sheet_name = f'汇总{year}'
 
         operations.append([sheet_name, 'write', summary_excel_data])
         operations.append([sheet_name, 'format', self.format_withdraw_2024])

{qrpa-1.1.7 → qrpa-1.1.9}/qrpa/shein_lib.py

@@ -303,19 +303,14 @@ class SheinLib:
 
         return info
 
-    def get_withdraw_list(self, supplier_id, mode='month'):
+    def get_withdraw_list(self, supplier_id, year=0):
         self.web_page.goto('https://sso.geiwohuo.com/#/mws/seller/new-account-overview')
         self.web_page.wait_for_load_state("load")
 
-        if mode == 'month':
+        if year == 0:
             first_day, last_day = TimeUtils.get_last_month_range_time()
         else:
-            first_day, last_day = TimeUtils.get_year_range_time(2024)
-
-        cache_file = f'{self.config.auto_dir}/shein/cache/withdraw_list_{first_day}_{last_day}.json'
-        withdraw_list = read_dict_from_file_ex(cache_file, self.store_username, 3600 * 12)
-        if len(withdraw_list) > 0:
-            return withdraw_list
+            first_day, last_day = TimeUtils.get_year_range_time(year)
 
         page_num = 1
         page_size = 200
@@ -341,12 +336,18 @@ class SheinLib:
         total = response_text['info']['count']
         totalPage = math.ceil(total / page_size)
 
+        cache_file = f'{self.config.auto_dir}/shein/cache/withdraw_list_{first_day}_{last_day}.json'
+        withdraw_list_cache = read_dict_from_file_ex(cache_file, self.store_username, 3600 * 12)
+        if len(withdraw_list_cache) == int(total):
+            log('返回缓存数据: ', len(withdraw_list_cache), total)
+            return withdraw_list_cache
+
         for page in range(2, totalPage + 1):
             log(f'获取提现列表 第{page}/{totalPage}页')
             page_num = page
             payload['pageNum'] = page_num
             response_text = fetch(self.web_page, url, payload)
-            withdraw_list = response_text['info']['list']
+            withdraw_list += response_text['info']['list']
             time.sleep(0.1)
 
         write_dict_to_file_ex(cache_file, {self.store_username: withdraw_list}, [self.store_username])
@@ -1028,10 +1029,10 @@ class SheinLib:
                 ])
 
             cache_file = f'{self.config.auto_dir}/shein/dict/sku_not_found.json'
-            write_dict_to_file(cache_file, dict_sku_not_found)
+            write_dict_to_file_ex(cache_file, {self.store_username: dict_sku_not_found}, [self.store_username])
 
             cache_file = f'{self.config.auto_dir}/shein/dict/sku_to_skc.json'
-            write_dict_to_file(cache_file, dict_sku_to_skc)
+            write_dict_to_file_ex(cache_file, {self.store_username: dict_sku_to_skc}, [self.store_username])
 
     # 存储商品库
     def store_product_info(self):

{qrpa-1.1.7 → qrpa-1.1.9}/qrpa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.1.7
+Version: 1.1.9
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>