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

qrpa/fun_excel.py

@@ -2149,6 +2149,7 @@ def add_formula_for_column(sheet, col_name, formula, start_row=2):
             # AutoFill 快速填充到所有行（start_row 到 last_row）
             sheet.range(f'{col_letter}{start_row}').api.AutoFill(
                 sheet.range(f'{col_letter}{start_row}:{col_letter}{last_row}').api)
+        sheet.range(f'{col_letter}:{col_letter}').autofit()
 
 def autofit_column(sheet, columns=None):
     if columns is None:

qrpa/fun_web.py

@@ -10,12 +10,13 @@ import inspect
 def fetch(page: Page, url: str, params: Optional[Union[dict, list, str]] = None, headers: Optional[dict] = None, config:
 Optional[dict] = None) -> dict:
     """
-    发送 HTTP POST 请求，支持自定义 headers。
+    发送 HTTP POST 请求，支持自定义 headers 和重定向处理。
 
     :param page: Playwright 的 Page 对象
     :param url: 请求地址
     :param params: 请求参数（dict、list、str 或 None）
     :param headers: 自定义 headers 字典
+    :param config: 请求配置字典
     :return: 服务器返回的 JSON 响应（dict）
     """
     if params is not None and not isinstance(params, (dict, list, str)):
@@ -26,7 +27,7 @@ Optional[dict] = None) -> dict:
     try:
         page.wait_for_load_state('load')
         response = page.evaluate("""
-            async ({ url, params, extraHeaders }) => {
+            async ({ url, params, extraHeaders, config }) => {
                 try {
                     const defaultHeaders = {
                         'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36',
@@ -37,9 +38,15 @@ Optional[dict] = None) -> dict:
                     const options = {
                         method: 'POST',
                         credentials: 'include',
+                        redirect: 'follow',  // 明确设置跟随重定向
                         headers: headers
                     };
 
+                    // 应用额外配置
+                    if (config) {
+                        Object.assign(options, config);
+                    }
+
                     if (params !== null) {
                         if (typeof params === 'string') {
                             options.headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8';
@@ -51,15 +58,40 @@ Optional[dict] = None) -> dict:
                     }
 
                     const response = await fetch(url, options);
+                    
+                    // 处理重定向
+                    if (response.redirected) {
+                        console.log(`请求被重定向到: ${response.url}`);
+                    }
+                    
                     if (!response.ok) {
+                        // 如果是重定向相关的状态码，尝试获取响应内容
+                        if (response.status >= 300 && response.status < 400) {
+                            const text = await response.text();
+                            return { 
+                                "error": "redirect_error", 
+                                "message": `HTTP ${response.status} - ${response.statusText}`,
+                                "redirect_url": response.url,
+                                "response_text": text,
+                                "status": response.status
+                            };
+                        }
                         throw new Error(`HTTP ${response.status} - ${response.statusText}`);
                     }
-                    return await response.json();
+                    
+                    // 尝试解析 JSON，如果失败则返回文本内容
+                    const contentType = response.headers.get('content-type');
+                    if (contentType && contentType.includes('application/json')) {
+                        return await response.json();
+                    } else {
+                        const text = await response.text();
+                        return { "content": text, "content_type": contentType, "final_url": response.url };
+                    }
                 } catch (error) {
                     return { "error": "fetch_failed", "message": error.message };
                 }
             }
-        """, {"url": url, "params": params, "extraHeaders": headers})
+        """, {"url": url, "params": params, "extraHeaders": headers, "config": config})
 
         return response
     except Exception as e:
@@ -148,7 +180,7 @@ def full_screen_shot(web_page: Page, config):
 
 def fetch_get(page: Page, url: str, headers: Optional[dict] = None, config: Optional[dict] = None) -> dict:
     """
-    发送 HTTP GET 请求，支持自定义 headers 和配置。
+    发送 HTTP GET 请求，支持自定义 headers 和配置，支持重定向处理。
     
     :param page: Playwright 的 Page 对象
     :param url: 请求地址
@@ -173,17 +205,43 @@ def fetch_get(page: Page, url: str, headers: Optional[dict] = None, config: Opti
                     const defaultConfig = {
                         method: 'GET',
                         credentials: 'include',
-                        mode: 'cors'
+                        mode: 'cors',
+                        redirect: 'follow'  // 明确设置跟随重定向
                     };
 
                     const headers = Object.assign({}, defaultHeaders, extraHeaders || {});
                     const options = Object.assign({}, defaultConfig, config || {}, { headers: headers });
 
                     const response = await fetch(url, options);
+                    
+                    // 处理重定向
+                    if (response.redirected) {
+                        console.log(`请求被重定向到: ${response.url}`);
+                    }
+                    
                     if (!response.ok) {
+                        // 如果是重定向相关的状态码，尝试获取响应内容
+                        if (response.status >= 300 && response.status < 400) {
+                            const text = await response.text();
+                            return { 
+                                "error": "redirect_error", 
+                                "message": `HTTP ${response.status} - ${response.statusText}`,
+                                "redirect_url": response.url,
+                                "response_text": text,
+                                "status": response.status
+                            };
+                        }
                         throw new Error(`HTTP ${response.status} - ${response.statusText}`);
                     }
-                    return await response.json();
+                    
+                    // 尝试解析 JSON，如果失败则返回文本内容
+                    const contentType = response.headers.get('content-type');
+                    if (contentType && contentType.includes('application/json')) {
+                        return await response.json();
+                    } else {
+                        const text = await response.text();
+                        return { "content": text, "content_type": contentType, "final_url": response.url };
+                    }
                 } catch (error) {
                     return { "error": "fetch_failed", "message": error.message };
                 }

qrpa/shein_excel.py

@@ -2442,7 +2442,7 @@ class SheinExcel:
         self.dealFormula(sheet)  # 有空再封装优化
         colorize_by_field(sheet, 'SPU')
         autofit_column(sheet, ['商品信息', '店铺名称', 'SKC点击率/SKC转化率', '自主参与活动'])
-        column_to_left(sheet, ['店铺名称', 'SKC点击率/SKC转化率', '自主参与活动','近7天SKU销量/SKC销量/SKC曝光'])
+        column_to_left(sheet, ['店铺名称', 'SKC点击率/SKC转化率', '自主参与活动', '近7天SKU销量/SKC销量/SKC曝光'])
         specify_column_width(sheet, ['商品标题'], 150 / 6)
         add_borders(sheet)
         InsertImageV2(sheet, ['SKC图片', 'SKU图片'], 'shein', 120, None, None, True)
@@ -2530,3 +2530,112 @@ class SheinExcel:
             sheet.range(rangeF).number_format = '0.00'
             sheet.range(rangeG).formula = f'=IF(ISNUMBER({rangeB}),{col_week_1}{row}*{col_gross_profit}{row},"")'
             sheet.range(rangeG).number_format = '0.00'
+
+    def write_check_order(self, erp, start_date, end_date):
+        header = ['店铺账号', '店铺别名', '店长', '报账单号', '货号', 'SKC', '平台SKU', '商家SKU', '属性集', '商品数量', '账单类型', '收支类型', '状态', '币种', '金额', 'ERP成本',
+                  '成本总额', '业务单号', '费用类型', '备注', '来源单号', '账单创建时间', '台账添加时间', '报账时间', '预计结算日期', '实际结算日期']
+        excel_data = [header]
+
+        dict_store = read_dict_from_file(self.config.shein_store_alias)
+
+        cache_file = f'{self.config.auto_dir}/shein/cache/check_order_{start_date}_{end_date}.json'
+        dict = read_dict_from_file(cache_file)
+        for store_username, data_list in dict.items():
+            for item in data_list:
+                store_name = dict_store.get(store_username)
+                store_manager = self.config.shein_store_manager.get(str(store_username).lower())
+
+                row_item = []
+                row_item.append(store_username)
+                row_item.append(store_name)
+                row_item.append(store_manager)
+                row_item.append(item['reportOrderNo'])
+                row_item.append(item['goodsSn'])
+                row_item.append(item['skcName'])
+                row_item.append(item['skuCode'])
+                row_item.append(item['skuSn'])
+                row_item.append(item['suffix'])
+                row_item.append(item['goodsCount'])
+                row_item.append(item['secondOrderTypeName'])
+                row_item.append(item['inAndOutName'])
+                row_item.append(item['settlementStatusName'])
+                row_item.append(item['settleCurrencyCode'])
+                row_item.append(item['income'])
+                row_item.append(self.bridge.get_sku_cost(item['skuSn'], erp))
+                row_item.append('')
+                row_item.append(item['bzOrderNo'])
+                row_item.append(item['expenseTypeName'])
+                row_item.append(item['remark'])
+                row_item.append(item['sourceNo'])
+                row_item.append(item['addTime'])
+                row_item.append(item['businessCompletedTime'])
+                row_item.append(item['reportTime'])
+                row_item.append(item['estimatePayTime'])
+                row_item.append(item['completedPayTime'])
+
+                excel_data.append(row_item)
+
+        cache_file_excel = f'{self.config.auto_dir}/shein/cache/shein_return_order_list_excel_{start_date}_{end_date}.json'
+        write_dict_to_file(cache_file_excel, excel_data)
+
+        sheet_name = '收支明细'
+        batch_excel_operations(self.config.excel_shein_finance_month_report_pop, [
+            (sheet_name, 'write', excel_data, ['R']),
+            (sheet_name, 'format', self.format_check_order)
+        ])
+
+        header = ['店铺账号', '店铺别名', '店长', '出库金额', '出库成本', '备货作业费', '代收服务费', '订单履约服务费', '订单退货', '退货处理费', '退货单履约服务费', '利润']
+        excel_data = [header]
+        cache_file = f'{self.config.auto_dir}/shein/cache/check_order_{start_date}_{end_date}.json'
+        dict = read_dict_from_file(cache_file)
+        for store_username, data_list in dict.items():
+            store_name = dict_store.get(store_username)
+            store_manager = self.config.shein_store_manager.get(str(store_username).lower())
+            row_item = []
+            row_item.append(store_username)
+            row_item.append(store_name)
+            row_item.append(store_manager)
+            row_item.append('')
+            row_item.append('')
+            row_item.append('')
+            row_item.append('')
+            row_item.append('')
+            row_item.append('')
+            row_item.append('')
+            row_item.append('')
+            row_item.append('')
+            excel_data.append(row_item)
+
+        sheet_name = '总表'
+        batch_excel_operations(self.config.excel_shein_finance_month_report_pop, [
+            (sheet_name, 'write', excel_data),
+            (sheet_name, 'format', self.format_check_order),
+            ('Sheet1', 'delete'),
+            (sheet_name, 'move', 1),
+        ])
+
+    def format_check_order(self, sheet):
+        if sheet.name == '收支明细':
+            beautify_title(sheet)
+            add_borders(sheet)
+            format_to_datetime(sheet, ['时间'])
+            format_to_date(sheet, ['日期'])
+            format_to_money(sheet, ['金额', '成本'])
+            column_to_right(sheet, ['金额', '成本'])
+            column_to_left(sheet, ['货号', '商家SKU'])
+            add_formula_for_column(sheet, '成本总额', '=IF(ISNUMBER(O2),O2*J2,0)')
+
+        if sheet.name == '总表':
+            beautify_title(sheet)
+            add_borders(sheet)
+            format_to_money(sheet, ['金额', '成本', '费', '订单退货', '利润'])
+            column_to_right(sheet, ['金额', '成本', '费', '订单退货', '利润'])
+            add_formula_for_column(sheet, '出库金额', '=SUMIFS(收支明细!O:O,收支明细!A:A,A2,收支明细!L:L,"收入")')
+            add_formula_for_column(sheet, '出库成本', '=SUMIFS(收支明细!P:P,收支明细!A:A,A2,收支明细!L:L,"收入")')
+            add_formula_for_column(sheet, '备货作业费', '=SUMIFS(收支明细!O:O,收支明细!A:A,A2,收支明细!L:L,"支出",收支明细!K:K,"备货作业费")')
+            add_formula_for_column(sheet, '代收服务费', '=SUMIFS(收支明细!O:O,收支明细!A:A,A2,收支明细!L:L,"支出",收支明细!K:K,"代收服务费")')
+            add_formula_for_column(sheet, '订单履约服务费', '=SUMIFS(收支明细!O:O,收支明细!A:A,A2,收支明细!L:L,"支出",收支明细!K:K,"订单履约服务费")')
+            add_formula_for_column(sheet, '订单退货', '=SUMIFS(收支明细!O:O,收支明细!A:A,A2,收支明细!L:L,"支出",收支明细!K:K,"订单退货")')
+            add_formula_for_column(sheet, '退货处理费', '=SUMIFS(收支明细!O:O,收支明细!A:A,A2,收支明细!L:L,"支出",收支明细!K:K,"退货处理费")')
+            add_formula_for_column(sheet, '退货单履约服务费', '=SUMIFS(收支明细!O:O,收支明细!A:A,A2,收支明细!L:L,"支出",收支明细!K:K,"退货单履约服务费")')
+            add_formula_for_column(sheet, '利润', '=D2-E2-F2-G2-H2-I2-J2')

qrpa/shein_lib.py

@@ -26,6 +26,7 @@ class SheinLib:
         self.DictQueryTime = {}
 
         self.deal_auth()
+        # self.get_user()
 
     # 处理鉴权
     def deal_auth(self):
@@ -101,6 +102,10 @@ class SheinLib:
                         if "crashed" in str(status_error):
                             break
 
+                    if web_page.locator('xpath=//div[text()="扫码登录"]').is_visible():
+                        log('检查到扫码登录,切换至账号登录', self.store_username, self.store_name)
+                        web_page.locator('xpath=//*[@id="container"]/div[2]/div[4]/img').click()
+
                     if web_page.locator('xpath=//div[@id="container" and @alita-name="gmpsso"]//button[@type="button" and @id]').nth(0).is_visible():
                         if 'https://sso.geiwohuo.com/#/home' not in web_page.url:
                             log("鉴权确定按钮可见 点击'确定'按钮", web_page.title(), web_page.url, self.store_username, self.store_name)
@@ -2889,3 +2894,45 @@ class SheinLib:
         write_dict_to_file_ex(cache_file, {self.store_name: NotifyItem}, {self.store_name})
 
         return excel_data
+
+    def check_order_list(self, source, first_day, last_day):
+        page_num = 1
+        page_size = 200  # 列表最多返回200条数据 大了没有用
+
+        cache_file = f'{self.config.auto_dir}/shein/cache/check_order_{first_day}_{last_day}.json'
+        list_item = read_dict_from_file_ex(cache_file, self.store_username)
+
+        url = f"https://sso.geiwohuo.com/gsfs/finance/reportOrder/dualMode/checkOrderList/item/union"
+        payload = {
+            "page"              : page_num,
+            "perPage"           : page_size,
+            "detailAddTimeStart": f"{first_day} 00:00:00",
+            "detailAddTimeEnd"  : f"{last_day} 23:59:59"
+        }
+        response_text = fetch(self.web_page, url, payload)
+        error_code = response_text.get('code')
+        if str(error_code) != '0':
+            raise send_exception(json.dumps(response_text, ensure_ascii=False))
+        list_item = response_text['info']['data']
+        total = response_text['info']['meta']['count']
+        totalPage = math.ceil(total / page_size)
+
+        if int(total) == len(list_item):
+            log('总数与缓存数量相同 跳过剩余页抓取', total)
+            return list_item
+
+        for page in range(2, totalPage + 1):
+            log(f'获取收支明细列表 第{page}/{totalPage}页')
+            payload['pageNumber'] = page
+            response_text = fetch(self.web_page, url, payload)
+            spu_list_new = response_text['info']['data']
+            list_item += spu_list_new
+            time.sleep(0.1)
+
+        for item in list_item:
+            supplierSku = item['skuSn']
+            item['cost_price'] = self.bridge.get_sku_cost(supplierSku, source)
+            item['sku_img'] = self.bridge.get_sku_img(supplierSku, source)
+
+        write_dict_to_file_ex(cache_file, {self.store_username: list_item}, [self.store_username])
+        return list_item

qrpa/shein_ziniao.py

@@ -376,7 +376,7 @@ class ZiniaoTaskManager:
                     return
 
                 # 打开店铺
-                print(f"=====打开店铺：{store_name}=====")
+                print(f"=====打开店铺：{store_name},{browser_id},{store_username}=====")
                 ret_json = self.browser.open_store(store_id)
                 print(ret_json)
                 store_id = ret_json.get("browserOauth") or ret_json.get("browserId")
@@ -488,7 +488,7 @@ class ZiniaoRunner:
             raise RuntimeError("店铺列表为空")
 
         # 多线程并发执行任务
-        max_threads = 1 if (hostname().lower() == 'krrpa') else 3
+        max_threads = 3 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/time_utils.py

@@ -8,7 +8,6 @@ import calendar
 from datetime import date, datetime, timedelta, timezone
 from typing import Optional, Tuple, List, Union
 
-
 class TimeUtils:
     """时间工具类，提供各种时间相关的静态方法"""
 
@@ -94,6 +93,17 @@ class TimeUtils:
         last_month = today.month - 1 if today.month > 1 else 12
         return last_month
 
+    @staticmethod
+    def get_last_two_month() -> int:
+        """获取上上个月的月份"""
+        today = datetime.today()
+        # 计算上上个月：当前月份减2
+        last_two_month = today.month - 2
+        # 处理跨年情况
+        if last_two_month < 1:
+            last_two_month += 12
+        return last_two_month
+
     # ==================== 日期范围计算 ====================
 
     @staticmethod
@@ -285,6 +295,7 @@ class TimeUtils:
             current_date += timedelta(days=1)
 
         return date_list
+
     # ==================== 月份相关 ====================
 
     @staticmethod
@@ -299,6 +310,24 @@ class TimeUtils:
 
         return first_day.strftime("%Y-%m-%d"), last_day.strftime("%Y-%m-%d")
 
+    @staticmethod
+    def get_last_two_month_range() -> Tuple[str, str]:
+        """获取上上个月的第一天和最后一天"""
+        today = datetime.today()
+        # 计算上上个月
+        last_two_month = today.month - 2
+        year = today.year
+
+        # 处理跨年情况
+        if last_two_month < 1:
+            last_two_month += 12
+            year -= 1
+
+        first_day = datetime(year, last_two_month, 1)
+        last_day = datetime(year, last_two_month, calendar.monthrange(year, last_two_month)[1])
+
+        return first_day.strftime("%Y-%m-%d"), last_day.strftime("%Y-%m-%d")
+
     @staticmethod
     def get_last_month_range_time_str() -> Tuple[str, str]:
         """获取上个月第一天和最后一天的时间字符串"""
@@ -618,7 +647,6 @@ class TimeUtils:
 
         return mtime_dt.strftime('%Y-%m-%d %H:%M:%S') if to_str else mtime_dt
 
-
 # ==================== 便捷函数 ====================
 # 为了保持向后兼容，提供一些便捷函数
 
@@ -626,197 +654,158 @@ def get_current_date() -> str:
     """获取当前日期，格式为 YYYYMMDD"""
     return TimeUtils.get_current_date()
 
-
 def get_current_datetime() -> str:
     """获取当前日期时间，格式为 YYYYMMDDHHMMSS"""
     return TimeUtils.get_current_datetime()
 
-
 def current_datetime() -> str:
     """获取当前日期时间，格式为 YYYY-MM-DD HH:MM:SS"""
     return TimeUtils.current_datetime()
 
-
 def today_date() -> str:
     """获取今天的日期，格式为 YYYY-MM-DD"""
     return TimeUtils.today_date()
 
-
 def today_date_hour() -> str:
     """获取今天的日期和小时，格式为 YYYY-MM-DD_HH"""
     return TimeUtils.today_date_hour()
 
-
 def get_yesterday(dt: Optional[str] = None) -> str:
     """获取昨天的日期"""
     return TimeUtils.get_yesterday(dt)
 
-
 def tomorrow_date() -> str:
     """获取明天的日期"""
     return TimeUtils.tomorrow_date()
 
-
 def before_yesterday() -> str:
     """获取前天的日期"""
     return TimeUtils.before_yesterday()
 
-
 def get_current_year() -> int:
     """获取当前年份"""
     return TimeUtils.get_current_year()
 
-
 def get_current_month() -> int:
     """获取当前月份"""
     return TimeUtils.get_current_month()
 
-
 def get_last_month() -> int:
     """获取上个月的月份"""
     return TimeUtils.get_last_month()
 
-
 def get_week_num() -> int:
     """获取当前是第几周"""
     return TimeUtils.get_week_num()
 
-
 def get_period() -> str:
     """获取当前时间段（上午/下午/晚上）"""
     return TimeUtils.get_period()
 
-
 def get_period2() -> str:
     """获取当前时间段（AM/PM）"""
     return TimeUtils.get_period2()
 
-
 def get_chinese_weekday(date_str: str) -> str:
     """根据输入的日期字符串返回中文星期几"""
     return TimeUtils.get_chinese_weekday(date_str)
 
-
 def get_weekday_name(date_str: str) -> str:
     """获取中文星期名称（简短格式）"""
     return TimeUtils.get_weekday_name(date_str)
 
-
 def is_in_month(time_str: str, month: int, fmt: str = "%Y-%m-%d") -> bool:
     """判断时间字符串是否在指定月份"""
     return TimeUtils.is_in_month(time_str, month, fmt)
 
-
 def date_trans(d_t: str) -> str:
     """无斜杠日期转成有斜杠日期"""
     return TimeUtils.date_trans(d_t)
 
-
 def is_date_greater_or_equal(date_str: str) -> bool:
     """比较指定日期是否大于或等于今天的日期"""
     return TimeUtils.is_date_greater_or_equal(date_str)
 
-
 def is_yesterday(create_time_str: str, dt: Optional[str] = None) -> bool:
     """判断给定的时间字符串是否是昨天"""
     return TimeUtils.is_yesterday(create_time_str, dt)
 
-
 def is_yesterday_date(date_str: str) -> bool:
     """判断给定的日期字符串是否是昨天"""
     return TimeUtils.is_yesterday_date(date_str)
 
-
 def get_file_mtime(file_path: str, to_str: bool = True, tz_offset: int = 8) -> Union[str, datetime]:
     """获取文件的修改时间"""
     return TimeUtils.get_file_mtime(file_path, to_str, tz_offset)
 
-
 def convert_timestamp_to_str(timestamp_ms: Optional[int]) -> str:
     """将毫秒时间戳转换为字符串"""
     return TimeUtils.convert_timestamp_to_str(timestamp_ms)
 
-
 def convert_timestamp_to_date(timestamp_ms: Union[int, float]) -> str:
     """将毫秒时间戳转换为日期字符串"""
     return TimeUtils.convert_timestamp_to_date(timestamp_ms)
 
-
 def convert_datetime_to_date(datetime_str: str) -> str:
     """将格式为 'YYYY-MM-DD HH:MM:SS' 的时间字符串转换为 'YYYY-MM-DD' 格式的日期字符串"""
     return TimeUtils.convert_datetime_to_date(datetime_str)
 
-
 def get_current_year_range() -> Tuple[str, str]:
     """获取当前年份的开始和结束日期"""
     return TimeUtils.get_current_year_range()
 
-
 def get_start_timestamps(date_str: str) -> int:
     """获取指定日期的开始毫秒时间戳（00:00:00.000）"""
     return TimeUtils.get_start_timestamps(date_str)
 
-
 def get_end_timestamps(date_str: str) -> int:
     """获取指定日期的结束毫秒时间戳（23:59:59.999）"""
     return TimeUtils.get_end_timestamps(date_str)
 
-
 def format_date_cross_platform(date_str: str) -> str:
     """跨平台格式化日期"""
     return TimeUtils.format_date_cross_platform(date_str)
 
-
 def get_past_7_days_range(start_from: Optional[str] = None) -> Tuple[str, str]:
     """获取过去7天的日期范围（包括结束日，共7天）"""
     return TimeUtils.get_past_7_days_range(start_from)
 
-
 def get_past_7_days_range_format(start_from: Optional[str] = None, format_str: str = '%Y-%m-%d') -> Tuple[str, str]:
     """获取过去7天的日期范围（包括结束日，共7天），支持自定义格式"""
     return TimeUtils.get_past_7_days_range_format(start_from, format_str)
 
-
 def get_past_nth_day(n: int, start_from: Optional[str] = None) -> str:
     """获取过去第n天的日期"""
     return TimeUtils.get_past_nth_day(n, start_from)
 
-
 def get_past_n_days_list(n: int, start_from: Optional[str] = None) -> List[str]:
     """获取过去n天的日期列表，从最旧到最近的日期"""
     return TimeUtils.get_past_n_days_list(n, start_from)
 
-
 def get_past_7_days_list(start_from: Optional[str] = None) -> List[str]:
     """获取过去7天的日期列表（不包含 start_from 当天），共7天"""
     return TimeUtils.get_past_7_days_list(start_from)
 
-
 def date_range(start_date: str, end_date: str) -> List[str]:
     """生成两个日期之间的日期列表"""
     return TimeUtils.date_range(start_date, end_date)
 
-
 def get_dates_from_first_of_month_to_yesterday() -> List[str]:
     """获取从本月第一天到昨天的日期列表"""
     return TimeUtils.get_dates_from_first_of_month_to_yesterday()
 
-
 def get_last_month_range() -> Tuple[str, str]:
     """获取上个月的第一天和最后一天"""
     return TimeUtils.get_last_month_range()
 
-
 def get_last_month_range_time_str() -> Tuple[str, str]:
     """获取上个月第一天和最后一天的时间字符串"""
     return TimeUtils.get_last_month_range_time_str()
 
-
 def get_last_month_range_time() -> Tuple[int, int]:
     """获取上个月第一天和最后一天的毫秒级时间戳"""
     return TimeUtils.get_last_month_range_time()
 
-
 # 为了向后兼容，保留一些旧函数名
 def get_past_7_days_range_old() -> Tuple[str, str]:
     """获取过去7天的日期范围（旧版本）"""
@@ -824,7 +813,6 @@ def get_past_7_days_range_old() -> Tuple[str, str]:
     start_date = end_date - timedelta(days=6)  # 往前推6天为开始日期
     return start_date.strftime('%Y-%m-%d'), end_date.strftime('%Y-%m-%d')
 
-
 def get_past_7_days_list_old() -> List[str]:
     """获取过去7天的日期列表（旧版本）"""
     today = datetime.today()
@@ -833,7 +821,6 @@ def get_past_7_days_list_old() -> List[str]:
         for i in range(1, 8)
     ]
 
-
 if __name__ == "__main__":
     # 测试示例
     print(f"当前日期: {today_date()}")

{qrpa-1.0.95.dist-info → qrpa-1.0.97.dist-info}/METADATA

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

{qrpa-1.0.95.dist-info → qrpa-1.0.97.dist-info}/RECORD

@@ -5,26 +5,26 @@ qrpa/feishu_bot_app.py,sha256=6r2YqCAMUN7y3F7onoABRmHC7S-UPOLHwbhsQnQ3IRc,9452
 qrpa/feishu_client.py,sha256=gXvyhf7r-IqeDhPjM01SfsGf17t8g1ZwUAkhymBkBeg,17544
 qrpa/feishu_logic.py,sha256=yuwb-LeZiHKGlz-W8JobinorHonVa8L-5h12WxnU7_Q,67508
 qrpa/fun_base.py,sha256=lMzqPwsbVfe968CUR2MVNImzIskIUZqPCE2tWxYqb5o,10728
-qrpa/fun_excel.py,sha256=knjBXTYdAz3HGAL3MHrLaF0OxfnR7qkCdzU0e7BKEHQ,117531
+qrpa/fun_excel.py,sha256=58Fjr1bX1KvRIm0NwaXMDq8yIcjBv4c8e5Zar4Mxaaw,117592
 qrpa/fun_file.py,sha256=yzjDV16WL5vRys7J4uQcNzIFkX4D5MAlSCwxcD-mwQo,11966
-qrpa/fun_web.py,sha256=Mv0m2P5fh2-U4DzRoVivqRcXD56BJ_Svj6TZznx49YU,8645
+qrpa/fun_web.py,sha256=2aYrtRlf-p-P6AyjrlIcmMVq8oSDePEY48YLm4ZRS1A,11857
 qrpa/fun_win.py,sha256=-LnTeocdTt72NVH6VgLdpAT9_C5oV9okeudXG6CftMA,8034
 qrpa/shein_daily_report_model.py,sha256=H8oZmIN5Pyqe306W1_xuz87lOqLQ_LI5RjXbaxDkIzE,12589
-qrpa/shein_excel.py,sha256=-X7RuE5VdEEvnpnGqHh_z8NLodsGCqOKbHADW0X-gcs,131132
-qrpa/shein_lib.py,sha256=Mzvooz7abPP61XzzrLj8EzDxJYPk-tPjqQLHgdOk64A,134380
+qrpa/shein_excel.py,sha256=QMgXHELu7-zR9CujN1W66qj8S3tDVJPfToW9i90_WaI,137668
+qrpa/shein_lib.py,sha256=kTA1CNITz99VnC3EqpHHkOk4B7dVdT1BDkUHjx3WrqI,136643
 qrpa/shein_mysql.py,sha256=Sgz6U0_3f4cT5zPf1Ht1OjvSFhrVPLkMxt91NV-ZPCM,3005
 qrpa/shein_sqlite.py,sha256=ZQwD0Gz81q9WY7tY2HMEYvSF9r3N_G_Aur3bYfST9WY,5707
-qrpa/shein_ziniao.py,sha256=4CsOPZXRDEqHJvCGyb8imCPqSH5Ln5fGqPUFqLuFgCg,21276
+qrpa/shein_ziniao.py,sha256=X7BupME0y80-MGMTbJ4C9EG2tGDJuVIymFV1MR61m_c,21339
 qrpa/temu_chrome.py,sha256=CbtFy1QPan9xJdJcNZj-EsVGhUvv3ZTEPVDEA4-im40,2803
 qrpa/temu_excel.py,sha256=2hGw76YWzkTZGyFCuuUAab4oHptYX9a6U6yjpNsL7FE,6990
 qrpa/temu_lib.py,sha256=hYB59zsLS3m3NTic_duTwPMOTSxlHyQVa8OhHnHm-1g,7199
-qrpa/time_utils.py,sha256=KFXnF1pMWACAKOSy483riPqvTsMjhQtFJAIhQsZKaMk,30075
+qrpa/time_utils.py,sha256=BMaR5gUl9K2z1qOpKgwrK7a3_NQ5dqcRQCbxn0mXusY,30971
 qrpa/time_utils_example.py,sha256=shHOXKKF3QSzb0SHsNc34M61wEkkLuM30U9X1THKNS8,8053
 qrpa/wxwork.py,sha256=gIytG19DZ5g7Tsl0-W3EbjfSnpIqZw-ua24gcB78YEg,11264
 qrpa/mysql_module/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qrpa/mysql_module/shein_product_model.py,sha256=v21_juWsZqTHj2k08GUGNkoRZ4hkKZKjaE-wmRl2a2k,19257
 qrpa/mysql_module/shein_return_order_model.py,sha256=Zt-bGOH_kCDbakW7uaTmqqo_qTT8v424yidcYSfWvWM,26562
-qrpa-1.0.95.dist-info/METADATA,sha256=Xb8nnIEE5eh7I8G_BUIS2n7w3IlCxnnThuMnJ9C7AO8,231
-qrpa-1.0.95.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-qrpa-1.0.95.dist-info/top_level.txt,sha256=F6T5igi0fhXDucPPUbmmSC0qFCDEsH5eVijfVF48OFU,5
-qrpa-1.0.95.dist-info/RECORD,,
+qrpa-1.0.97.dist-info/METADATA,sha256=aptoNJ0O4Cl_wzSgwydE3RD11yfHm-_NRi9sdZWJs1g,231
+qrpa-1.0.97.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qrpa-1.0.97.dist-info/top_level.txt,sha256=F6T5igi0fhXDucPPUbmmSC0qFCDEsH5eVijfVF48OFU,5
+qrpa-1.0.97.dist-info/RECORD,,