qrpa 1.0.67__py3-none-any.whl → 1.0.69__py3-none-any.whl

qrpa/shein_excel.py

@@ -281,11 +281,11 @@ class SheinExcel:
         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_return_list, [
-            (sheet_name, 'write', excel_data, ['W', 'Z']),
-            (sheet_name, 'format', self.format_return_list)
-        ])
+        # sheet_name = '希音退货列表'
+        # batch_excel_operations(self.config.excel_return_list, [
+        #     (sheet_name, 'write', excel_data, ['W', 'Z']),
+        #     (sheet_name, 'format', self.format_return_list)
+        # ])
 
         excel_data = [header]
         cache_file = f'{self.config.auto_dir}/shein/cache/shein_return_order_list_{TimeUtils.today_date()}.json'
@@ -381,7 +381,8 @@ class SheinExcel:
 
         batch_excel_operations(self.config.excel_return_list, [
             (sheet_name, 'write', excel_data, ['W', 'Z']),
-            (sheet_name, 'format', self.format_return_list)
+            (sheet_name, 'format', self.format_return_list),
+            ('Sheet1', 'delete')
         ])
 
     def format_return_list(self, sheet):

qrpa/shein_lib.py

@@ -234,10 +234,11 @@ class SheinLib:
 
         url = f"https://sso.geiwohuo.com/pfmp/returnOrder/page"
         payload = {
-            "addTimeStart": f"{start_date} 00:00:00",
-            "addTimeEnd"  : f"{end_date} 23:59:59",
-            "page"        : page_num,
-            "perPage"     : page_size
+            "returnOrderType": 1,  # 只查询退货
+            "addTimeStart"   : f"{start_date} 00:00:00",
+            "addTimeEnd"     : f"{end_date} 23:59:59",
+            "page"           : page_num,
+            "perPage"        : page_size
         }
         response_text = fetch(self.web_page, url, payload)
         error_code = response_text.get('code')
@@ -259,30 +260,31 @@ class SheinLib:
         today_list_item = []
         # 过滤 退货出库时间 是昨天的
         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
             returnOrderId = item['id']
-            item['return_box_detail'] = []
-            item['qc_report_url'] = ''
-            item['report_url'] = ''
             item['store_username'] = self.store_username
             item['store_name'] = self.store_name
             item['store_manager'] = self.config.shein_store_manager.get(str(self.store_username).lower())
-            if has_valid_package:
-                return_box_detail = self.get_return_order_box_detail(returnOrderId)
-                if 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)
+            item['qc_report_url'] = ''
+            if int(item['returnScrapType']) == 1:
+                purchaseCode = item['sellerOrderNo']
+                delivery_code = item['sellerDeliveryNo']
+                item['qc_report_url'] = self.get_qc_report_url(delivery_code, purchaseCode)
+
+            item['report_url'] = ''
+            if int(item['returnScrapType']) == 2:
+                item['report_url'] = self.get_inspect_report_url(returnOrderId)
 
-                    if int(item['returnScrapType']) == 2:
-                        item['report_url'] = self.get_inspect_report_url(returnOrderId)
+            item['return_box_detail'] = []
 
+            all_list_item.append(item)
+            has_valid_package = item.get('hasPackage') == 1
+            if has_valid_package:
+                return_box_detail = self.get_return_order_box_detail(returnOrderId)
+                if len(return_box_detail) > 0:
                     item['return_box_detail'] = return_box_detail
 
-                    all_list_item.append(item)
+                    is_valid_yesterday = TimeUtils.is_yesterday(item['completeTime'], None) if item.get('completeTime') else False
                     if is_valid_yesterday:
                         today_list_item.append(item)
 

{qrpa-1.0.67.dist-info → qrpa-1.0.69.dist-info}/METADATA

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

{qrpa-1.0.67.dist-info → qrpa-1.0.69.dist-info}/RECORD

@@ -10,8 +10,8 @@ qrpa/fun_file.py,sha256=yzjDV16WL5vRys7J4uQcNzIFkX4D5MAlSCwxcD-mwQo,11966
 qrpa/fun_web.py,sha256=F6cxwwOxB8twg2XK73oAvKla0FqpwDYJiM37CWmFwXo,6322
 qrpa/fun_win.py,sha256=-LnTeocdTt72NVH6VgLdpAT9_C5oV9okeudXG6CftMA,8034
 qrpa/shein_daily_report_model.py,sha256=H8oZmIN5Pyqe306W1_xuz87lOqLQ_LI5RjXbaxDkIzE,12589
-qrpa/shein_excel.py,sha256=vtmeEF_LbH6cVyitDDCNjuT76Nuov6Zvhsf-gIMd0H0,124780
-qrpa/shein_lib.py,sha256=qeo46Htko_12-Tsag78hjyeMHoNaySCXgqT-h_-IjVs,126711
+qrpa/shein_excel.py,sha256=1F9QMMsaihDfwr0ajSSQdXksBCjuKSPwMynfP7Jlkso,124825
+qrpa/shein_lib.py,sha256=fTrSRnbAb1X9BUr6_ZrBjWDHbwbRz1wIe5kmGHs2r60,126731
 qrpa/shein_mysql.py,sha256=SrgBYPNWaKHIpD5Q7hqz3GWvytXO8u9SPvKxJvLwYsI,2720
 qrpa/shein_sqlite.py,sha256=ZQwD0Gz81q9WY7tY2HMEYvSF9r3N_G_Aur3bYfST9WY,5707
 qrpa/shein_ziniao.py,sha256=Xc4pgSa7PxgmR24rClgz_HcTRb2fdbXp6slzfpCOThI,18745
@@ -24,7 +24,7 @@ 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=qViI_Ik3SkXXxqJ1nXjimvfB_a5uiwW9RXL0fOreBao,18880
 qrpa/mysql_module/shein_return_order_model.py,sha256=Zt-bGOH_kCDbakW7uaTmqqo_qTT8v424yidcYSfWvWM,26562
-qrpa-1.0.67.dist-info/METADATA,sha256=zI6fBzT7JgPGnMZcC-Td_Iw0UkRKIFJEIOYXUcR9NZ4,231
-qrpa-1.0.67.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-qrpa-1.0.67.dist-info/top_level.txt,sha256=F6T5igi0fhXDucPPUbmmSC0qFCDEsH5eVijfVF48OFU,5
-qrpa-1.0.67.dist-info/RECORD,,
+qrpa-1.0.69.dist-info/METADATA,sha256=aS7CedCLn7LSxrbEBUhcQjfSbTQfiggglh0nG87qxRQ,231
+qrpa-1.0.69.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qrpa-1.0.69.dist-info/top_level.txt,sha256=F6T5igi0fhXDucPPUbmmSC0qFCDEsH5eVijfVF48OFU,5
+qrpa-1.0.69.dist-info/RECORD,,