qrpa 1.0.57__tar.gz → 1.0.59__tar.gz

{qrpa-1.0.57 → qrpa-1.0.59}/PKG-INFO

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

{qrpa-1.0.57 → qrpa-1.0.59}/pyproject.toml

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

{qrpa-1.0.57 → qrpa-1.0.59}/qrpa/fun_excel.py

@@ -73,6 +73,49 @@ excel_color_index = {
     "深蓝灰色"     : 55,  # #333399
 }
 
+def aggregate_by_column(data, group_by_col_name):
+    """
+    根据指定列名对二维表数据聚合：
+    - 数字列求和
+    - 字符串列用换行符拼接
+
+    :param data: 二维列表，第一行为表头
+    :param group_by_col_name: 要聚合的列名，如 "店长"
+    :return: 聚合后的二维列表
+    """
+    headers = data[0]
+    group_index = headers.index(group_by_col_name)
+    grouped = defaultdict(list)
+
+    # 按 group_by 列聚合行
+    for row in data[1:]:
+        key = row[group_index]
+        grouped[key].append(row)
+
+    result = [headers]
+
+    for key, rows in grouped.items():
+        agg_row = []
+        for col_idx in range(len(headers)):
+            col_values = [r[col_idx] for r in rows]
+            # 聚合字段
+            if col_idx == group_index:
+                agg_value = key
+            else:
+                # 尝试将值转为 float，如果成功就求和，否则拼接
+                try:
+                    nums = [float(v) for v in col_values if
+                            isinstance(v, (int, float)) or (isinstance(v, str) and v.strip() != '')]
+                    agg_value = sum(nums)
+                except ValueError:
+                    # 拼接字符串（去重可加 set）
+                    strings = [str(v).strip() for v in col_values if str(v).strip()]
+                    agg_value = '\n'.join(strings)
+            agg_row.append(agg_value)
+        result.append(agg_row)
+
+    return result
+
 def set_cell_prefix_red(cell, n, color_name):
     """
     将指定 Excel 单元格内容的前 n 个字符设置为红色。

{qrpa-1.0.57 → qrpa-1.0.59}/qrpa/shein_excel.py

@@ -15,6 +15,176 @@ class SheinExcel:
         self.bridge = bridge
         pass
 
+    def write_week_ntb(self):
+        excel_path = create_file_path(self.config.excel_week_report)
+
+        cache_file = f'{self.config.auto_dir}/shein/dict/new_product_to_bak_{TimeUtils.today_date()}.json'
+        dict = read_dict_from_file(cache_file)
+        # dict_store = read_dict_from_file(config.dict_store_cache)
+
+        summary_excel_data = []
+        header = []
+        dict_store_bak_stat = {}
+        for store_username, excel_data in dict.items():
+            # store_name = dict_store.get(store_username)
+            if dict_store_bak_stat.get(store_username) is None:
+                dict_store_bak_stat[store_username] = [0, 0]
+            for item in excel_data[1:]:
+                dict_store_bak_stat[store_username][0] += 1
+                if int(item[6]) == 1:
+                    dict_store_bak_stat[store_username][1] += 1
+            header = excel_data[0]
+            summary_excel_data += excel_data[1:]
+        summary_excel_data = [header] + summary_excel_data
+        log(summary_excel_data)
+        sheet_name = '新品转备货款明细'
+
+        # write_data(excel_path, sheet_name, summary_excel_data)
+        # self.format_week_ntb(excel_path, sheet_name)
+
+        batch_excel_operations(excel_path, [
+            (sheet_name, 'write', summary_excel_data),
+            (sheet_name, 'format', self.format_week_ntb),
+        ])
+
+        dict_key = f'{self.config.auto_dir}/shein/dict/dict_store_bak_stat_{TimeUtils.today_date()}.json'
+        write_dict_to_file(dict_key, dict_store_bak_stat)
+
+    def format_week_ntb(self, sheet):
+        beautify_title(sheet)
+        format_to_date(sheet, ['统计日期'])
+        format_to_percent(sheet, ['占比'])
+        colorize_by_field(sheet, 'SPU')
+        column_to_left(sheet, ['商品信息', '第4周SKC点击率/SKC转化率', '第4周SKC销量/SKC曝光'])
+        autofit_column(sheet, ['店铺名称', '商品信息', '第4周SKC点击率/SKC转化率', '第4周SKC销量/SKC曝光'])
+        add_borders(sheet)
+        InsertImageV2(sheet, ['SKC图片'], 'shein', 120)
+
+    def dealFundsExcelFormat(self, sheet):
+        col_a = find_column_by_data(sheet, 1, '店铺名称')
+        col_b = find_column_by_data(sheet, 1, '在途商品金额')
+        col_c = find_column_by_data(sheet, 1, '在仓商品金额')
+        col_d = find_column_by_data(sheet, 1, '待结算金额')
+        col_e = find_column_by_data(sheet, 1, '可提现金额')
+        col_f = find_column_by_data(sheet, 1, '汇总')
+        col_g = find_column_by_data(sheet, 1, '导出时间')
+        col_h = find_column_by_data(sheet, 1, '销售出库金额')
+
+        sheet.range(f'{col_a}:{col_a}').column_width = 25
+        sheet.range(f'{col_g}:{col_g}').number_format = 'yyyy-mm-dd hh:mm:ss'
+
+        last_row = sheet.range('A' + str(sheet.cells.last_cell.row)).end('up').row
+        sheet.range(f'{col_b}2').formula = f'=SUM({col_b}3:{col_b}{last_row})'
+        sheet.range(f'{col_b}2').number_format = '¥#,##0.00'
+        cell = sheet.range(f'{col_b}2')
+        cell.api.Font.Color = 255  # RGB(255, 0, 0)，红色对应的颜色代码
+        cell.api.Font.Bold = True
+
+        sheet.range(f'{col_c}2').formula = f'=SUM({col_c}3:{col_c}{last_row})'
+        sheet.range(f'{col_c}2').number_format = '¥#,##0.00'
+        cell = sheet.range(f'{col_c}2')
+        cell.api.Font.Color = 255  # RGB(255, 0, 0)，红色对应的颜色代码
+        cell.api.Font.Bold = True
+
+        sheet.range(f'{col_d}2').formula = f'=SUM({col_d}3:{col_d}{last_row})'
+        sheet.range(f'{col_d}2').number_format = '¥#,##0.00'
+        cell = sheet.range(f'{col_d}2')
+        cell.api.Font.Color = 255  # RGB(255, 0, 0)，红色对应的颜色代码
+        cell.api.Font.Bold = True
+
+        sheet.range(f'{col_e}2').formula = f'=SUM({col_e}3:{col_e}{last_row})'
+        sheet.range(f'{col_e}2').number_format = '¥#,##0.00'
+        cell = sheet.range(f'{col_e}2')
+        cell.api.Font.Color = 255  # RGB(255, 0, 0)，红色对应的颜色代码
+        cell.api.Font.Bold = True
+
+        sheet.range(f'{col_h}2').formula = f'=SUM({col_h}3:{col_h}{last_row})'
+        sheet.range(f'{col_h}2').number_format = '¥#,##0.00'
+        cell = sheet.range(f'{col_h}2')
+        cell.api.Font.Color = 255  # RGB(255, 0, 0)，红色对应的颜色代码
+        cell.api.Font.Bold = True
+
+        # 遍历可用行
+        used_range_row = sheet.range('A1').expand('down')
+        for i, cell in enumerate(used_range_row):
+            row = i + 1
+            if row < 2:
+                continue
+            # 设置数字格式
+            sheet.range(f'{col_b}{row}').number_format = '¥#,##0.00'
+            sheet.range(f'{col_c}{row}').number_format = '¥#,##0.00'
+            sheet.range(f'{col_d}{row}').number_format = '¥#,##0.00'
+            sheet.range(f'{col_e}{row}').number_format = '¥#,##0.00'
+            sheet.range(f'{col_f}{row}').formula = f'=SUM({col_b}{row}:{col_e}{row})'
+            sheet.range(f'{col_f}{row}').number_format = '¥#,##0.00'
+            sheet.range(f'{col_f}{row}').api.Font.Color = 255
+            sheet.range(f'{col_f}{row}').api.Font.Bold = True
+
+        add_borders(sheet)
+
+    def write_week_finance_report(self):
+        cache_file = f'{self.config.auto_dir}/shein/cache/stat_fund_lz_{TimeUtils.today_date()}.json'
+        dict = read_dict_from_file(cache_file)
+        dict_key = f'{self.config.auto_dir}/shein/dict/dict_store_bak_stat_{TimeUtils.today_date()}.json'
+        dict_store_bak_stat = read_dict_from_file(dict_key)
+        data = []
+        for key, val in dict.items():
+            data.append(val)
+        log(data)
+        for item in data:
+            store_username = item[1]
+            item[9] = dict_store_bak_stat[store_username][0]
+            item[10] = dict_store_bak_stat[store_username][1]
+
+        data.sort(key=lambda row: row[8], reverse=True)
+        excel_path = create_file_path(self.config.excel_week_report)
+        sheet_name = '按店铺汇总'
+        data.insert(0, ['汇总', '', '', '', '', '', '', '', '', '', '', '', ''])
+        data.insert(0, ['店铺名称', '店铺账号', '店长', '在途商品金额', '在仓商品金额', '待结算金额', '可提现金额', '汇总',
+                        '销售出库金额', '新品上架数量', '成功转备货款', '成功率', '导出时间'])
+        write_data(excel_path, sheet_name, data)
+        app, wb, sheet = open_excel(excel_path, sheet_name)
+        beautify_title(sheet)
+
+        self.dealFundsExcelFormat(sheet)
+        format_to_percent(sheet, ['成功率'], 0)
+        add_formula_for_column(sheet, '成功率', '=IF(J2=0, 0, k2/J2)', 2)
+        add_formula_for_column(sheet, '新品上架数量', "=COUNTIF('新品转备货款明细'!A:A, B3)", 3)
+        add_formula_for_column(sheet, '成功转备货款', "=COUNTIFS('新品转备货款明细'!A:A, B3, '新品转备货款明细'!G:G, 1)", 3)
+        add_sum_for_cell(sheet, ['新品上架数量', '成功转备货款'])
+        column_to_right(sheet, ['金额', '汇总'])
+        sheet.autofit()
+        delete_sheet_if_exists(wb, 'Sheet1')
+        wb.save()
+        close_excel(app, wb)
+
+        new_data = data
+        new_data = aggregate_by_column(new_data, '店长')
+        new_data_sorted = new_data[2:]
+        new_data_sorted.sort(key=lambda row: row[8], reverse=True)
+
+        sheet_name = '按店长汇总'
+        write_data(excel_path, sheet_name, data[:2] + new_data_sorted)
+        app, wb, sheet = open_excel(excel_path, sheet_name)
+        add_borders(sheet)
+        format_to_money(sheet, ['金额', '成本'])
+        format_to_datetime(sheet, ['时间'])
+        format_to_percent(sheet, ['成功率'], 0)
+        add_formula_for_column(sheet, '成功率', '=IF(J2=0, 0, k2/J2)', 2)
+        # 聚合的不能使用这种公式
+        # add_formula_for_column(sheet, '新品上架数量',"=COUNTIF('新品转备货款明细'!A:A, B3)",3)
+        # add_formula_for_column(sheet, '成功转备货款',"=COUNTIFS('新品转备货款明细'!A:A, B3, '新品转备货款明细'!G:G, 1)",3)
+        add_sum_for_cell(sheet, ['在途商品金额', '在仓商品金额', '待结算金额', '可提现金额', '汇总', '销售出库金额',
+                                 '新品上架数量', '成功转备货款'])
+        clear_for_cell(sheet, ['店铺账号', '导出时间'])
+        add_formula_for_column(sheet, '汇总', f'=SUM(D3:G3)', 3)
+        set_title_style(sheet)
+        column_to_right(sheet, ['金额', '汇总'])
+        autofit_column(sheet, ['店铺名称', '店铺账号', '导出时间'])
+        wb.save()
+        close_excel(app, wb)
+        WxWorkBot('b30aaa8d-1a1f-4378-841a-8b0f8295f2d9').send_file(excel_path)
+
     # 退货列表
     def write_return_list(self, erp, start_date, end_date):
         header = ['退货单号', '退货出库时间', '签收状态', '店铺信息', '店长', '退货类型', '退货原因', 'SKC图片', 'SKC信息', '商家SKU', '属性集', 'SKU退货数量', '平台SKU', 'ERP默认供货商', 'ERP成本', '包裹名', '包裹号', '退货计划单号', '订单号', '发货单', '退回方式', '快递名称', '运单号', '退货地址', '商家联系人', '商家手机号', '入库问题图片地址']
@@ -217,7 +387,7 @@ class SheinExcel:
         format_to_money(sheet, ['单价', '金额', '成本'])
         column_to_right(sheet, ['单价', '金额', '成本'])
         wrap_column(sheet, ['退货原因', '退货地址', '入库问题图片地址'])
-        autofit_column(sheet, ['店铺信息','店铺别名', 'SKC信息'])
+        autofit_column(sheet, ['店铺信息', '店铺别名', 'SKC信息'])
         column_to_left(sheet, ['店铺信息', '商家SKU', '供方货号', '属性集', 'SKC信息', '退货地址'])
         specify_column_width(sheet, ['退货原因', 'SKC信息', '商家SKU', '退货地址'], 200 / 6)
         InsertImageV2(sheet, ['SKC图片'])

{qrpa-1.0.57 → qrpa-1.0.59}/qrpa/shein_lib.py

@@ -617,6 +617,201 @@ class SheinLib:
         log(f'正在获取 {self.store_name} 最近一个月出库金额: {last_item["totalCustomerAmount"]}')
         return last_item['totalCustomerAmount']
 
+    # 获取备货信息列表
+    def get_bak_base_info(self):
+        log(f'获取备货信息列表 {self.store_name} {self.store_username}')
+        url = "https://sso.geiwohuo.com/idms/goods-skc/list"
+        pageNumber = 1
+        pageSize = 100
+        payload = {
+            "pageNumber"            : pageNumber,
+            "pageSize"              : pageSize,
+            "supplierCodes"         : "",
+            "skcs"                  : "",
+            "spu"                   : "",
+            "c7dSaleCntBegin"       : "",
+            "c7dSaleCntEnd"         : "",
+            "goodsLevelIdList"      : [],
+            "supplyStatus"          : "",
+            "shelfStatus"           : "",
+            "categoryIdList"        : [],
+            "skcStockBegin"         : "",
+            "skcStockEnd"           : "",
+            "skuStockBegin"         : "",
+            "skuStockEnd"           : "",
+            "skcSaleDaysBegin"      : "",
+            "skcSaleDaysEnd"        : "",
+            "skuSaleDaysBegin"      : "",
+            "skuSaleDaysEnd"        : "",
+            "planUrgentCountBegin"  : "",
+            "planUrgentCountEnd"    : "",
+            "skcAvailableOrderBegin": "",
+            "skcAvailableOrderEnd"  : "",
+            "skuAvailableOrderBegin": "",
+            "skuAvailableOrderEnd"  : "",
+            "shelfDateBegin"        : "",
+            "shelfDateEnd"          : "",
+            "stockWarnStatusList"   : [],
+            "labelFakeIdList"       : [],
+            "sheinSaleByInventory"  : "",
+            "tspIdList"             : [],
+            "adviceStatus"          : [],
+            "sortBy7dSaleCnt"       : 2
+        }
+        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))
+
+        spu_list = response_text['info']['list']
+
+        skc_list = [item['skc'] for item in spu_list]
+        self.get_sku_price_v2(skc_list)
+
+        total = response_text['info']['count']
+        totalPage = math.ceil(total / pageSize)
+        for page in range(2, totalPage + 1):
+            log(f'获取备货信息商品列表 第{page}/{totalPage}页')
+            payload['pageNumber'] = page
+            response_text = fetch(self.web_page, url, payload)
+
+            new_spu_list = response_text['info']['list']
+            spu_list += new_spu_list
+
+            skc_list = [item['skc'] for item in new_spu_list]
+            self.get_sku_price_v2(skc_list)
+
+            time.sleep(0.3)
+
+        key = f'{self.store_username}'
+        cache_file = f'{self.config.auto_dir}/shein/cache/bak_info_list_{key}.json'
+        write_dict_to_file_ex(cache_file, {key: spu_list}, [key])
+
+        return spu_list
+
+    def get_skc_week_sale_list(self, spu, skc, start_from=None):
+        dict_skc = self.get_dict_skc_week_trend_v2(spu, skc, start_from)
+        date_list = TimeUtils.get_past_7_days_list(start_from)
+        saleCnt7d = 0
+        sales_detail = []
+        for date in date_list:
+            saleCnt = get_safe_value(dict_skc.get(date, {}), 'saleCnt', 0)
+            epsUvIdx = get_safe_value(dict_skc.get(date, {}), 'epsUvIdx', 0)
+
+            saleCnt7d += saleCnt
+            sales_detail.append(f'{date}({TimeUtils.get_weekday_name(date)}): {saleCnt}/{epsUvIdx}')
+
+        sales_data = []
+        for date in date_list:
+            goodsUvIdx = get_safe_value(dict_skc.get(date, {}), 'goodsUvIdx', 0)  # 商详访客
+            epsGdsCtrIdx = get_safe_value(dict_skc.get(date, {}), 'epsGdsCtrIdx', 0)  # 点击率
+
+            payUvIdx = get_safe_value(dict_skc.get(date, {}), 'payUvIdx', 0)  # 支付人数
+            gdsPayCtrIdx = get_safe_value(dict_skc.get(date, {}), 'gdsPayCtrIdx', 0)  # 转化率
+
+            sales_data.append(f'{date}({TimeUtils.get_weekday_name(date)}): {epsGdsCtrIdx:.2%}({goodsUvIdx})/{gdsPayCtrIdx:.2%}({payUvIdx})')
+
+        return sales_detail, sales_data, saleCnt7d
+
+    def stat_new_product_to_bak(self):
+        # 直接调用 get_skc_week_actual_sales 來获取周销 计算是否能转成备货款
+        skc_list = self.get_bak_base_info()  # 这个地方 不要加已上架和正常供货参数 直接取所有的skc列表
+        # 以算昨日7.2日为例 上架天数为29天(转换成上架日期),且过去7天销量达到类目备货标准和没有达到备货标准的skc数量
+        # 1.计算某个skc的上架日期
+        # 2.计算某个skc的基于某个日期的过去7天销量
+        # 3.获取叶子类目的备货标准
+        header = ['店铺账号', '店铺名称', '店长', '统计日期', 'SKC图片', '商品信息', '新品成功转备货款', '第4周SKC销量/SKC曝光', '第4周SKC点击率/SKC转化率', 'SKC', 'SPU']
+        excel_data = []
+        stat_date_list = TimeUtils.get_dates_from_first_of_month_to_yesterday()
+        for stat_date in stat_date_list:
+            # 计算 stat_date 这天 的上架日期 是 filter_shelf_date
+            filter_shelf_date = TimeUtils.get_past_nth_day(29, stat_date)
+            log(f'stat_date:{stat_date},filter_shelf_date:{filter_shelf_date}')
+            # 筛选 上架日期是 filter_shelf_date 这天的skc有哪些
+            filter_skc_list = [skc_item for skc_item in skc_list if skc_item['shelfDate'] == filter_shelf_date]
+            # 再统计 这些skc 在 stat_date 这天的 前7天销量
+            # 看看这个7天销量是否达到了类目的备货标准 统计 计数
+            for skc_item in filter_skc_list:
+                skc = skc_item['skc']
+                spu = skc_item['spu']
+                log(f'skc:{skc}, spu:{spu}')
+
+                row_item = []
+                row_item.append(self.store_username)
+
+                status_cn = skc_item.get('shelfStatus').get('name')
+                goods_level = skc_item['goodsLevel']['name']
+                goods_label = [label["name"] for label in skc_item['goodsLabelList']]
+                store_info = f'{self.store_name}\n({status_cn})\n{goods_level}\n{",".join(goods_label).strip()}\n{stat_date_list[-1]}\n{stat_date_list[0]}'
+                row_item.append(store_info)
+                store_manager = self.config.shein_store_manager.get(str(self.store_username).lower())
+                row_item.append(store_manager)
+                row_item.append(stat_date)
+                row_item.append(skc_item['picUrl'])
+
+                standard_value = (skc_item.get('stockStandard') or {}).get('value') or 0
+
+                sale_detail, sale_rate, sale_num = self.get_skc_week_sale_list(spu, skc, stat_date)
+                success = int(standard_value > 0 and sale_num >= standard_value)
+
+                categoryName = skc_item['categoryName']
+                shelfDate = skc_item['shelfDate']
+                product_info = (
+                    f'SPU: {spu}\n'
+                    f'SKC: {skc}\n'
+                    f'上架日期: {shelfDate}\n'
+                    f'类目: {categoryName}\n'
+                    f'备货标准/第4周销: {standard_value}/{sale_num}\n'
+                )
+                row_item.append(product_info)
+                row_item.append(success)
+                row_item.append("\n".join(sale_detail))
+                row_item.append("\n".join(sale_rate))
+                row_item.append(skc)
+                row_item.append(spu)
+                excel_data.append(row_item)
+
+        cache_file = f'{self.config.auto_dir}/shein/dict/new_product_to_bak_{TimeUtils.today_date()}.json'
+        write_dict_to_file_ex(cache_file, {self.store_username: [header] + excel_data}, [self.store_username])
+
+    def get_funds_data_lz(self):
+        log(f'正在获取 {self.store_name} 财务数据')
+        url = "https://sso.geiwohuo.com/sso/homePage/dataOverview/v2/detail"
+        payload = {
+            "metaIndexIds": [
+                298,
+                67,
+                70,
+                72
+            ],
+        }
+        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))
+        info = response_text.get('info')
+        num298 = 0  # 在途商品金额
+        num67 = 0  # 在仓商品金额
+        num70 = 0  # 待结算金额
+        num72 = 0  # 可提现金额
+        for item in info['list']:
+            if item['metaIndexId'] == 298:
+                num298 = item['count']
+            if item['metaIndexId'] == 67:
+                num67 = item['count']
+            if item['metaIndexId'] == 70:
+                num70 = item['count']
+            if item['metaIndexId'] == 72:
+                num72 = item['count']
+
+        outAmount = self.get_last_month_outbound_amount()
+        store_manager = self.config.shein_store_manager.get(str(self.store_username).lower())
+        NotifyItem = [f'{self.store_name}', self.store_username, store_manager, num298, num67, num70, num72, '', outAmount, '', '', '', TimeUtils.current_datetime()]
+        log(NotifyItem)
+        cache_file = f'{self.config.auto_dir}/shein/cache/stat_fund_lz_{TimeUtils.today_date()}.json'
+        write_dict_to_file_ex(cache_file, {self.store_username: NotifyItem}, [self.store_username])
+        return NotifyItem
+
     def get_funds_data(self):
         log(f'正在获取 {self.store_name} 财务数据')
         url = "https://sso.geiwohuo.com/sso/homePage/dataOverview/v2/detail"
@@ -968,7 +1163,6 @@ class SheinLib:
         return count
 
     def get_week_sales_stat_detail(self):
-        global ListNotify, NotifyItem
         dt = self.get_dt_time()
         yesterday = TimeUtils.get_yesterday(dt)
         date_7_days_ago = TimeUtils.get_past_nth_day(6, None, '%Y-%m-%d')
@@ -1145,7 +1339,7 @@ class SheinLib:
                 item.append(stock_str)
                 item.append(cost_price)
                 item.append(supplyPrice)
-                sale_num_list, sale_data_list = self.get_skc_week_sale_list(spu, skc, sku)
+                sale_num_list, sale_data_list = self.get_sku_week_sale_list(spu, skc, sku)
                 item.append("\n".join(sale_num_list))
                 item.append("\n".join(sale_data_list))
                 item.append(self.get_skc_activity_label(skc, sku, dictActivityPrice))
@@ -1943,7 +2137,7 @@ class SheinLib:
                 sku_item.append(skc)  # SKC
                 sku_item.append(spu_info['supplierCode'])  # SKC货号
 
-                sale_num_list, sale_data_list = self.get_skc_week_sale_list(spu, skc, sku)
+                sale_num_list, sale_data_list = self.get_sku_week_sale_list(spu, skc, sku)
                 sku_item.append("\n".join(sale_num_list))
                 sku_item.append("\n".join(sale_data_list))
                 sku_item.append(self.get_skc_activity_label(skc, sku, dictActivityPrice))
@@ -1968,13 +2162,17 @@ class SheinLib:
         return product_sku_list
 
     # 获取一个skc一周内的销售趋势（商品明细中的）
-    def get_dict_skc_week_trend_v2(self, spu, skc):
+    def get_dict_skc_week_trend_v2(self, spu, skc, start_from=None):
         dt = self.get_dt_time()
 
-        date_7_days_ago = TimeUtils.get_past_nth_day(7, None, '%Y%m%d')
-        log('-7', date_7_days_ago)
-        date_1_days_ago = TimeUtils.get_past_nth_day(1, None, '%Y%m%d')
-        log('-1', date_1_days_ago)
+        date_7_days_ago, date_1_days_ago = TimeUtils.get_past_7_days_range_format(start_from, '%Y%m%d')
+        log(date_7_days_ago, date_1_days_ago, 'dt', dt)
+
+        # 将字符串转换为日期对象
+        date1 = datetime.strptime(date_1_days_ago, "%Y%m%d").date()
+        date2 = datetime.strptime(dt, "%Y%m%d").date()
+        if date1 > date2:
+            send_exception(f'get_dict_skc_week_trend_v2: dt:{dt} < date_1_days_ago: {date_1_days_ago}')
 
         cache_file = f'{self.config.auto_dir}/shein/dict/dict_skc_week_trend_{skc}_{date_7_days_ago}_{date_1_days_ago}.json'
         if datetime.now().hour >= 9:
@@ -2013,7 +2211,7 @@ class SheinLib:
         write_dict_to_file(cache_file, DictSkc)
         return DictSkc
 
-    def get_skc_week_sale_list(self, spu, skc, sku):
+    def get_sku_week_sale_list(self, spu, skc, sku):
         dict_skc = self.get_dict_skc_week_trend_v2(spu, skc)
         date_list = TimeUtils.get_past_7_days_list()
         first_day, last_day = TimeUtils.get_past_7_days_range()
@@ -2386,7 +2584,7 @@ class SheinLib:
                 if mode in [6] and sales7cn > 0:
                     continue
 
-                sale_num_list, sale_data_list = self.get_skc_week_sale_list(spu, skc, sku)
+                sale_num_list, sale_data_list = self.get_sku_week_sale_list(spu, skc, sku)
                 row_item.append("\n".join(sale_num_list))
                 row_item.append("\n".join(sale_data_list))
                 row_item.append(self.get_skc_activity_label(skc, sku, dictActivityPrice))

{qrpa-1.0.57 → qrpa-1.0.59}/qrpa.egg-info/PKG-INFO

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