qrpa 1.0.96__py3-none-any.whl → 1.0.98__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

@@ -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()
@@ -2442,7 +2450,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 +2538,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_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

@@ -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)