qrpa 1.0.42__tar.gz → 1.0.43__tar.gz

{qrpa-1.0.42 → qrpa-1.0.43}/PKG-INFO

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

{qrpa-1.0.42 → qrpa-1.0.43}/pyproject.toml

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

{qrpa-1.0.42 → qrpa-1.0.43}/qrpa/fun_excel.py

@@ -149,37 +149,58 @@ def merge_by_column_v2(sheet, column_name, other_columns):
         log(f'未找到合并的列名: {column_name}')
         return
 
-    data = sheet.range(f'{col_letter}1').expand('table').value
-    # col_index = column_name_to_index(col_letter)
-    start_row = 1
-    merge_ranges = []  # 用来存储所有待合并的单元格范围
+    # 更安全的数据获取方式，确保获取完整的数据范围
+    last_row = get_last_row(sheet, col_letter)
+    data = sheet.range(f'{col_letter}1:{col_letter}{last_row}').value
+    
+    # 确保data是列表格式
+    if not isinstance(data, list):
+        data = [data]
+    
+    log(f'数据范围: {col_letter}1:{col_letter}{last_row}, 数据长度: {len(data)}')
+    
+    start_row = 2  # 从第2行开始，跳过表头
+    merge_row_ranges = []  # 用来存储需要合并的行范围 (start_row, end_row)
 
-    # 缓存其他列的列号
-    other_columns_index = {}
+    # 获取所有需要合并的列
+    all_columns = [col_letter]  # 主列
     for col in other_columns:
         col_name = find_column_by_data(sheet, 1, col)
         if col_name:
-            other_columns_index[col_name] = column_name_to_index(col_name)
+            all_columns.append(col_name)
+    
+    log(f'需要合并的列: {all_columns}')
 
+    # 遍历数据行，从第2行开始（索引1）到最后一行
     for row in range(2, len(data) + 1):
-        log(f'查找 {row}/{len(data)}')
-        if data[row - 1][0] != data[row - 2][0]:
-            if row - start_row > 1:
-                # 将合并范围加入列表
-                merge_ranges.append((col_letter, start_row, row - 1))
-                for col_name, col_index in other_columns_index.items():
-                    merge_ranges.append((col_name, start_row, row - 1))
+        log(f'查找 {row}/{len(data)}, 当前值: {data[row-1] if row-1 < len(data) else "超出范围"}, 前一个值: {data[row-2] if row-2 < len(data) else "超出范围"}')
+        
+        # 检查值是否发生变化（不是最后一行时）
+        value_changed = row < len(data) and data[row - 1] != data[row - 2]
+        
+        if value_changed:
+            # 值发生变化，处理前一组
+            if row - start_row > 0:
+                end_row = row - 1
+                log(f'添加合并范围: {start_row} 到 {end_row}')
+                merge_row_ranges.append((start_row, end_row))
             start_row = row
 
-    if len(data) - start_row > 1:
-        merge_ranges.append((col_letter, start_row, len(data)))
-        for col_name, col_index in other_columns_index.items():
-            merge_ranges.append((col_name, start_row, len(data)))
+    # 处理最后一组数据（循环结束后，start_row 到数据末尾）
+    if start_row <= len(data):
+        log(f'处理最后一组: {start_row} 到 {len(data)}')
+        merge_row_ranges.append((start_row, len(data)))
 
-    # 批量合并单元格
-    for col_name, start, end in merge_ranges:
-        log(f'处理 {col_name}{start}:{col_name}{end} merge')
-        sheet.range(f'{col_name}{start}:{col_name}{end}').merge()
+    log(f'行合并范围: {merge_row_ranges}')
+    
+    # 对每个行范围，在所有指定列中执行合并
+    for start_row, end_row in merge_row_ranges:
+        if start_row < end_row:  # 只有当开始行小于结束行时才合并
+            for col_name in all_columns:
+                log(f'处理 {col_name}{start_row}:{col_name}{end_row} merge')
+                sheet.range(f'{col_name}{start_row}:{col_name}{end_row}').merge()
+        else:
+            log(f'跳过无效合并范围: {start_row} 到 {end_row}')
 
 def merge_by_column(sheet, column_name, other_columns):
     log('正在处理合并单元格')

{qrpa-1.0.42 → qrpa-1.0.43}/qrpa/shein_excel.py

@@ -209,7 +209,8 @@ class SheinExcel:
         ])
 
     def format_return_list(self, sheet):
-        merge_by_column_v2(sheet, '退货单号', ['签收状态', '店铺信息', '店长', '退货类型', '退货原因', 'SKC图片', 'SKC信息', '包裹名', '包裹号', '退货计划单号', '订单号', '发货单', '退货出库时间', '退回方式', '快递名称', '运单号', '退货地址', '商家联系人', '商家手机号', '入库问题图片地址'])
+        merge_by_column_v2(sheet, '包裹号', ['包裹名'])
+        merge_by_column_v2(sheet, '退货单号', ['签收状态', '店铺信息', '店长', '退货类型', '退货原因', 'SKC图片', 'SKC信息', '退货计划单号', '订单号', '发货单', '退货出库时间', '退回方式', '快递名称', '运单号', '退货地址', '商家联系人', '商家手机号', '入库问题图片地址'])
         beautify_title(sheet)
         add_borders(sheet)
         format_to_datetime(sheet, ['时间'])

{qrpa-1.0.42 → qrpa-1.0.43}/qrpa/shein_lib.py

@@ -135,6 +135,21 @@ class SheinLib:
         log(qc_report_url)
         return qc_report_url
 
+    # 获取稽查报表
+    def get_inspect_report_url(self, returnOrderId):
+        log(f'获取稽查报告:{returnOrderId}')
+        url = f"https://sso.geiwohuo.com/pfmp/returnOrder/queryInspectReport"
+        payload = {
+            "returnOrderId": returnOrderId,
+        }
+        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))
+        report_url = (response_text.get('info', {}).get('data') or [{'reportUrl': '稽查报告生成中,请稍后查看'}])[0].get('reportUrl')
+        log(report_url)
+        return report_url
+
     def get_return_order_box_detail(self, returnOrderId):
         log(f'获取退货包裹详情: {returnOrderId}')
         url = f"https://sso.geiwohuo.com/pfmp/returnOrder/getReturnOrderBoxDetail"
@@ -151,6 +166,7 @@ class SheinLib:
 
         cache_file = f'{self.config.auto_dir}/shein/cache/shein_return_order_box_detail_{returnOrderId}.json'
         write_dict_to_file(cache_file, list_item)
+        return list_item
 
     def get_return_order_list(self, start_date, end_date, only_yesterday=1):
 
@@ -188,13 +204,21 @@ class SheinLib:
         for item in list_item:
             has_valid_package = item.get('hasPackage') == 1
             is_valid_yesterday = TimeUtils.is_yesterday(item['completeTime'], None) if item.get('completeTime') else False
-            if has_valid_package:
+            returnOrderId = item['id']
+            return_box_detail = self.get_return_order_box_detail(returnOrderId)
+            item['qc_report_url'] = ''
+            item['report_url'] = ''
+            if has_valid_package and len(return_box_detail) > 0:
+
                 if int(item['returnScrapType']) == 1:
                     purchaseCode = item['sellerOrderNo']
                     delivery_code = item['sellerDeliveryNo']
                     item['qc_report_url'] = self.get_qc_report_url(delivery_code, purchaseCode)
-                returnOrderId = item['id']
-                self.get_return_order_box_detail(returnOrderId)
+
+                if int(item['returnScrapType']) == 2:
+                    item['report_url'] = self.get_inspect_report_url(returnOrderId)
+
+                item['return_box_detail'] = return_box_detail
 
                 all_list_item.append(item)
                 if is_valid_yesterday:

{qrpa-1.0.42 → qrpa-1.0.43}/qrpa/shein_ziniao.py

@@ -24,7 +24,6 @@ from .fun_win import find_software_install_path
 from .fun_base import log, hostname, send_exception
 from .fun_file import check_progress_json_ex, get_progress_json_ex, done_progress_json_ex, write_dict_to_file_ex
 
-
 class ZiniaoClient:
     """紫鸟客户端管理类"""
 
@@ -53,7 +52,7 @@ class ZiniaoClient:
     def _get_user_info(self) -> Dict[str, str]:
         """获取用户登录信息"""
         return {
-            "company": self.config.ziniao.company,
+            "company" : self.config.ziniao.company,
             "username": self.config.ziniao.username,
             "password": self.config.ziniao.password
         }
@@ -90,7 +89,7 @@ class ZiniaoClient:
     def update_core(self):
         """下载所有内核，打开店铺前调用，需客户端版本5.285.7以上"""
         data = {
-            "action": "updateCore",
+            "action"   : "updateCore",
             "requestId": str(uuid.uuid4()),
         }
         data.update(self.user_info)
@@ -146,7 +145,6 @@ class ZiniaoClient:
         print('@@ get_exit...' + json.dumps(data))
         self.send_http(data)
 
-
 class ZiniaoBrowser:
     """紫鸟浏览器操作类"""
 
@@ -155,22 +153,22 @@ class ZiniaoBrowser:
         self.config = config
 
     def open_store(self, store_info: str, isWebDriverReadOnlyMode: int = 0,
-                   isprivacy: int = 0, isHeadless: int = 0,
-                   cookieTypeSave: int = 0, jsInfo: str = "") -> Dict[str, Any]:
+            isprivacy: int = 0, isHeadless: int = 0,
+            cookieTypeSave: int = 0, jsInfo: str = "") -> Dict[str, Any]:
         """打开店铺"""
         request_id = str(uuid.uuid4())
         data = {
-            "action": "startBrowser",
-            "isWaitPluginUpdate": 0,
-            "isHeadless": isHeadless,
-            "requestId": request_id,
+            "action"                 : "startBrowser",
+            "isWaitPluginUpdate"     : 0,
+            "isHeadless"             : isHeadless,
+            "requestId"              : request_id,
             "isWebDriverReadOnlyMode": isWebDriverReadOnlyMode,
-            "cookieTypeLoad": 0,
-            "cookieTypeSave": cookieTypeSave,
-            "runMode": "1",
-            "isLoadUserPlugin": False,
-            "pluginIdType": 1,
-            "privacyMode": isprivacy
+            "cookieTypeLoad"         : 0,
+            "cookieTypeSave"         : cookieTypeSave,
+            "runMode"                : "1",
+            "isLoadUserPlugin"       : False,
+            "pluginIdType"           : 1,
+            "privacyMode"            : isprivacy
         }
         data.update(self.client.user_info)
 
@@ -196,9 +194,9 @@ class ZiniaoBrowser:
         """关闭店铺"""
         request_id = str(uuid.uuid4())
         data = {
-            "action": "stopBrowser",
-            "requestId": request_id,
-            "duplicate": 0,
+            "action"      : "stopBrowser",
+            "requestId"   : request_id,
+            "duplicate"   : 0,
             "browserOauth": browser_oauth
         }
         data.update(self.client.user_info)
@@ -213,11 +211,11 @@ class ZiniaoBrowser:
             print(f"Fail {json.dumps(r, ensure_ascii=False)} ")
             raise RuntimeError("关闭店铺失败")
 
-    def get_browser_list(self) -> List[Dict[str, Any]]:
+    def get_browser_list(self, platform_name="SHEIN-全球") -> List[Dict[str, Any]]:
         """获取浏览器列表"""
         request_id = str(uuid.uuid4())
         data = {
-            "action": "getBrowserList",
+            "action"   : "getBrowserList",
             "requestId": request_id
         }
         data.update(self.client.user_info)
@@ -225,7 +223,8 @@ class ZiniaoBrowser:
         r = self.client.send_http(data)
         if str(r.get("statusCode")) == "0":
             print(r)
-            return r.get("browserList", [])
+            # return r.get("browserList", [])
+            return [site for site in r.get("browserList", []) if site.get("platform_name") == platform_name]
         elif str(r.get("statusCode")) == "-10003":
             print(f"login Err {json.dumps(r, ensure_ascii=False)}")
             raise RuntimeError("登录错误")
@@ -267,7 +266,6 @@ class ZiniaoBrowser:
         # 标记完成
         done_progress_json_ex(self.config, task_key, store_name)
 
-
 class ZiniaoTaskManager:
     """紫鸟任务管理类"""
 
@@ -276,10 +274,10 @@ class ZiniaoTaskManager:
         self.config = config
 
     def run_single_store_task(self, browser_info: Dict[str, Any],
-                              run_func: Callable, task_key: str,
-                              just_store_username: Optional[List[str]] = None,
-                              is_skip_store: Optional[Callable] = None
-                              ):
+            run_func: Callable, task_key: str,
+            just_store_username: Optional[List[str]] = None,
+            is_skip_store: Optional[Callable] = None
+    ):
         """运行单个店铺的任务"""
         retry_count = 0
         while True:
@@ -350,20 +348,20 @@ class ZiniaoTaskManager:
                     break
 
     def run_all_stores_task(self, browser_list: List[Dict[str, Any]],
-                            run_func: Callable, task_key: str,
-                            just_store_username: Optional[List[str]] = None,
-                            is_skip_store: Optional[Callable] = None
-                            ):
+            run_func: Callable, task_key: str,
+            just_store_username: Optional[List[str]] = None,
+            is_skip_store: Optional[Callable] = None
+    ):
         """循环运行所有店铺的任务"""
         for browser_info in browser_list:
             self.run_single_store_task(browser_info, run_func, task_key, just_store_username, is_skip_store)
 
     def run_with_thread_pool(self, browser_list: List[Dict[str, Any]],
-                             max_threads: int = 3, run_func: Callable = None,
-                             task_key: str = None,
-                             just_store_username: Optional[List[str]] = None,
-                             is_skip_store: Optional[Callable] = None
-                             ):
+            max_threads: int = 3, run_func: Callable = None,
+            task_key: str = None,
+            just_store_username: Optional[List[str]] = None,
+            is_skip_store: Optional[Callable] = None
+    ):
         """使用线程池控制最大并发线程数运行任务"""
         with ThreadPoolExecutor(max_workers=max_threads) as executor:
             task = partial(self.run_single_store_task,
@@ -373,7 +371,6 @@ class ZiniaoTaskManager:
             log(f'店铺总数: {len(browser_list)}')
             executor.map(task, browser_list)
 
-
 class ZiniaoRunner:
     """紫鸟主运行器类"""
 
@@ -387,13 +384,14 @@ class ZiniaoRunner:
         self.task_manager = ZiniaoTaskManager(self.browser, config)
 
     def execute(self, run_prepare: Optional[Callable] = None,
-                run: Optional[Callable] = None,
-                run_summary: Optional[Callable] = None,
-                run_notify: Optional[Callable] = None,
-                task_key: Optional[str] = None,
-                just_store_username: Optional[List[str]] = None,
-                is_skip_store: Optional[Callable] = None,
-                ):
+            run: Optional[Callable] = None,
+            run_summary: Optional[Callable] = None,
+            run_notify: Optional[Callable] = None,
+            task_key: Optional[str] = None,
+            just_store_username: Optional[List[str]] = None,
+            is_skip_store: Optional[Callable] = None,
+            platform_name: Optional[str] = "SHEIN-全球",
+    ):
         """主执行入口"""
         # 前置执行 if run_prepare:
         run_prepare()
@@ -408,7 +406,7 @@ class ZiniaoRunner:
 
         # 获取店铺列表
         print("=====获取店铺列表=====")
-        browser_list = self.browser.get_browser_list()
+        browser_list = self.browser.get_browser_list(platform_name=platform_name)
         if not browser_list:
             print("browser list is empty")
             raise RuntimeError("店铺列表为空")
@@ -445,6 +443,5 @@ class ZiniaoRunner:
         # 关闭客户端
         self.client.exit()
 
-
 if __name__ == "__main__":
     pass

{qrpa-1.0.42 → qrpa-1.0.43}/qrpa.egg-info/PKG-INFO

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