qrpa 1.1.8__tar.gz → 1.1.10__tar.gz

{qrpa-1.1.8 → qrpa-1.1.10}/PKG-INFO

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

{qrpa-1.1.8 → qrpa-1.1.10}/pyproject.toml

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

{qrpa-1.1.8 → qrpa-1.1.10}/qrpa/shein_excel.py

@@ -20,7 +20,7 @@ class SheinExcel:
         dict_sku_not_found = read_dict_from_file(cache_file)
 
         excel_data = []
-        for store_username,data_list in dict_sku_not_found.items():
+        for store_username, data_list in dict_sku_not_found.items():
             excel_data += data_list
 
         sheet_name1 = '未匹配SKU_需运营调整'
@@ -32,7 +32,7 @@ class SheinExcel:
         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():
+        for store_username, data_list in sku_to_skc.items():
             excel_data += data_list
 
         sheet_name = 'sku到skc映射'
@@ -60,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 = []
@@ -115,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.8 → qrpa-1.1.10}/qrpa/shein_lib.py

@@ -26,7 +26,7 @@ class SheinLib:
         self.DictQueryTime = {}
 
         self.deal_auth()
-        # self.get_user()
+        self.get_user()
 
     # 处理鉴权
     def deal_auth(self):
@@ -263,7 +263,7 @@ class SheinLib:
 
         # 特定于此请求的配置
         fetch_config = {
-            "credentials"   : "omit",
+            "credentials"   : "include",
             "referrer"      : "https://sso.geiwohuo.com/",
             "referrerPolicy": "strict-origin-when-cross-origin"
         }
@@ -273,12 +273,12 @@ class SheinLib:
         if str(error_code) != '0':
             raise send_exception(json.dumps(response_text, ensure_ascii=False))
         info = response_text.get('info', {})
-        log(info)
         cache_file = f'{self.config.auto_dir}/shein_user.json'
         info['store_username'] = self.store_username
         info['store_name'] = self.store_name
         write_dict_to_file_ex(cache_file, {self.store_username: info}, [self.store_username])
-
+        log(info)
+        self.user_info = info
         return info
 
     # 获取供货商信息
@@ -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])
@@ -906,9 +907,9 @@ class SheinLib:
         write_dict_to_file(cache_file, data)
         return data
 
-    def get_product_detail(self, spu_name):
+    def get_product_detail(self, spu_name, cache_interval=3600 * 24 * 7):
         cache_file = f'{self.config.auto_dir}/shein/product_detail/product_detail_{spu_name}.json'
-        info = read_dict_from_file(cache_file, 3600 * 24 * 7)
+        info = read_dict_from_file(cache_file, cache_interval)
         if len(info) > 0:
             return info
 
@@ -1659,7 +1660,14 @@ class SheinLib:
         item["day"] = day_item["dataDate"]
         item["sales_num"] = day_item["saleCnt1d"]
         item['sales_num_inc'] = item['sales_num'] - last_item.get('sales_num', 0)
-        item['sales_amount'] = day_item['dealAmt1d']
+
+        if int(self.user_info.get('lv1CategoryId')) == 216506:  # 自运营POP店
+            log('gmv1d', day_item['gmv1d'])
+            item['sales_amount'] = day_item['gmv1d'] if isinstance(day_item['gmv1d'], (int, float)) else 0
+        else:
+            item['sales_amount'] = day_item['dealAmt1d']
+
+        log('sales_amount', item['sales_amount'])
         item['sales_amount_inc'] = item['sales_amount'] - float(last_item.get('sales_amount', 0))
         item['visitor_num'] = day_item['idxShopGoodsUv1d']
         item['visitor_num_inc'] = item['visitor_num'] - last_item.get('visitor_num', 0)
@@ -2238,6 +2246,23 @@ class SheinLib:
 
         return dict
 
+    def get_sku_price_pop(self, spu):
+        pass
+        log(f'获取pop sku价格列表', spu)
+        info = self.get_product_detail(spu)
+
+        dict_sku_price_new = {}
+        for skc_item in info['skc_list']:
+            for sku_item in skc_item['sku_list']:
+                sku = sku_item['sku_code']
+                special_price = sku_item['price_info_list'][0]['special_price']
+                dict_sku_price_new[sku] = special_price
+
+        cache_file = f'{self.config.auto_dir}/shein/sku_price/sku_price_{self.store_username}.json'
+        dict_sku_price = read_dict_from_file(cache_file)
+        dict_sku_price.update(dict_sku_price_new)
+        write_dict_to_file(cache_file, dict_sku_price)
+
     def get_sku_price_v2(self, skc_list):
         log(f'获取sku价格列表', skc_list)
         url = "https://sso.geiwohuo.com/idms/goods-skc/price"
@@ -2796,6 +2821,10 @@ class SheinLib:
             raise send_exception(json.dumps(response_text, ensure_ascii=False))
 
         spu_list = response_text['info']['list']
+        # if int(self.user_info.get('lv1CategoryId')) == 216506:  # 自运营POP店
+        #     for spu_item in spu_list:
+        #         spu = spu_item.get('spu')
+        #         self.get_sku_price_pop(spu)
 
         skc_list = [item['skc'] for item in spu_list]
         self.get_activity_label(skc_list)
@@ -2812,6 +2841,11 @@ class SheinLib:
             response_text = fetch(self.web_page, url, payload)
             spu_list_new = response_text['info']['list']
 
+            # if int(self.user_info.get('lv1CategoryId')) == 216506:  # 自运营POP店
+            #     for spu_item in spu_list:
+            #         spu = spu_item.get('spu')
+            #         self.get_product_detail(spu)
+
             skc_list = [item['skc'] for item in spu_list_new]
             self.get_activity_label(skc_list)
             self.get_preemption_list(skc_list)

{qrpa-1.1.8 → qrpa-1.1.10}/qrpa/shein_ziniao.py

@@ -489,7 +489,7 @@ class ZiniaoRunner:
             raise RuntimeError("店铺列表为空")
 
         # 多线程并发执行任务
-        max_threads = 3 if (hostname().lower() == 'krrpa' or hostname().lower() == 'jyrpa') else 3
+        max_threads = 1 if (hostname().lower() == 'krrpa' or hostname().lower() == 'jyrpa') else 3
         log(f'当前启用线程数: {max_threads}')
         self.task_manager.run_with_thread_pool(browser_list, max_threads, run, task_key, just_store_username, is_skip_store)
 

{qrpa-1.1.8 → qrpa-1.1.10}/qrpa.egg-info/PKG-INFO

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