qrpa 1.1.37__tar.gz → 1.1.39__tar.gz

{qrpa-1.1.37 → qrpa-1.1.39}/PKG-INFO

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

{qrpa-1.1.37 → qrpa-1.1.39}/pyproject.toml

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

{qrpa-1.1.37 → qrpa-1.1.39}/qrpa/mysql_module/new_product_analysis_model.py

@@ -36,6 +36,13 @@ class SheinNewProductAnalysis(Base):
     skc = Column(String(100), nullable=False, comment='平台SKC')
     sku_supplier_no = Column(String(100), nullable=True, comment='商家SKC')
     layer_nm = Column(String(100), nullable=True, comment='商品层级')
+    
+    # 品类信息
+    new_cate1_nm = Column(String(200), nullable=True, comment='一级品类名称')
+    new_cate2_nm = Column(String(200), nullable=True, comment='二级品类名称')
+    new_cate3_nm = Column(String(200), nullable=True, comment='三级品类名称')
+    new_cate4_nm = Column(String(200), nullable=True, comment='四级品类名称')
+    
     goods_name = Column(String(500), nullable=True, comment='商品标题')
     img_url = Column(String(500), nullable=True, comment='SKC图片URL')
 
@@ -339,6 +346,10 @@ class NewProductAnalysisManager:
                 'skc'             : skc,
                 'sku_supplier_no' : item.get('skuSupplierNo'),
                 'layer_nm'        : item.get('layerNm'),
+                'new_cate1_nm'    : item.get('newCate1Nm'),
+                'new_cate2_nm'    : item.get('newCate2Nm'),
+                'new_cate3_nm'    : item.get('newCate3Nm'),
+                'new_cate4_nm'    : item.get('newCate4Nm'),
                 'goods_name'      : item.get('goodsName'),
                 'img_url'         : item.get('imgUrl'),
                 'onsale_flag'     : int(item.get('onsaleFlag', 0)),

{qrpa-1.1.37 → qrpa-1.1.39}/qrpa/shein_excel.py

@@ -5,6 +5,7 @@ from .time_utils import TimeUtils
 from .wxwork import WxWorkBot
 from .shein_daily_report_model import SheinStoreSalesDetailManager, SheinStoreSalesDetail
 
+import os
 import pandas as pd
 import numpy as np
 
@@ -2938,7 +2939,7 @@ class SheinExcel:
                 # 在"金额"列后面插入两列
                 new_header = header[:amount_col_idx + 1] + ['ERP成本', '成本总额'] + header[amount_col_idx + 1:]
                 log(f'在第{amount_col_idx + 1}列（金额）后面插入"ERP成本"和"成本总额"两列')
-                
+
                 # 业务单号列在插入新列后的索引需要调整
                 if business_no_col_idx is not None and business_no_col_idx > amount_col_idx:
                     business_no_col_idx_adjusted = business_no_col_idx + 2  # 因为插入了2列
@@ -3005,7 +3006,7 @@ class SheinExcel:
         # 查找需要格式化为文本的列
         text_format_columns = []
         str_keywords = ['业务单号']
-        
+
         def col_idx_to_letter(idx):
             """将列索引转换为Excel列字母 (0->A, 1->B, ..., 25->Z, 26->AA, ...)"""
             result = ''
@@ -3015,7 +3016,7 @@ class SheinExcel:
                 result = chr(65 + idx % 26) + result
                 idx //= 26
             return result
-        
+
         for col_idx, col_name in enumerate(header):
             col_name_str = str(col_name)
             # 检查列名是否包含需要保持为文本的关键词
@@ -3023,7 +3024,7 @@ class SheinExcel:
                 col_letter = col_idx_to_letter(col_idx)
                 text_format_columns.append(col_letter)
                 log(f'列"{col_name}"（第{col_idx}列，Excel列{col_letter}）将格式化为文本')
-        
+
         log(f'共{len(text_format_columns)}列需要格式化为文本: {text_format_columns}')
 
         # 使用batch_excel_operations批量写入和格式化
@@ -3123,3 +3124,154 @@ class SheinExcel:
                     add_formula_for_column(sheet, '退货单履约服务费', f'=SUMIFS({detail_sheet}!{amount_col}:{amount_col},{detail_sheet}!{store_col}:{store_col},A2,{detail_sheet}!{type_col}:{type_col},"支出",{detail_sheet}!{bill_type_col}:{bill_type_col},"退货单履约服务费")')
 
             add_formula_for_column(sheet, '利润', '=D2-E2-F2-G2-H2-I2-J2-K2')
+
+    def write_vssv_order_list(self):
+        """
+        写入VSSV增值服务订单列表到Excel
+        """
+        # 获取上个月的时间范围
+        first_day, last_day = TimeUtils.get_last_month_range()
+        last_month = TimeUtils.get_last_month()
+
+        # 读取店铺别名映射
+        dict_store = read_dict_from_file(self.config.shein_store_alias)
+
+        # 准备Excel数据
+        header = ['店铺账号', '店铺名称', '增值服务订单号', '增值服务单号', '采购订单号',
+                  '平台SKC', '商家SKC', 'SKC数量','扣款单号', '订单状态', '实际总金额',
+                  '增值服务项', '创建时间', '完成时间']
+        excel_data = [header]
+
+        # 遍历vssv_order目录下的所有店铺数据
+        src_directory = f'{self.config.auto_dir}/shein/vssv_order'
+
+        if not os.path.exists(src_directory):
+            log(f'VSSV订单目录不存在: {src_directory}')
+            return
+
+        for entry in os.listdir(src_directory):
+            # 检查是否为匹配的缓存文件
+            if entry.startswith(f"vssv_order_list_") and entry.endswith(f"_{first_day}_{last_day}.json"):
+                file_path = os.path.join(src_directory, entry)
+
+                # 从文件名中提取店铺账号
+                # 格式: vssv_order_list_{store_username}_{first_day}_{last_day}.json
+                parts = entry.replace('.json', '').split('_')
+                if len(parts) >= 5:
+                    # vssv_order_list_{store_username}_{first_day}_{last_day}
+                    # parts[0]='vssv', parts[1]='order', parts[2]='list', parts[3]=store_username
+                    store_username = parts[3]
+                else:
+                    log(f'无法解析店铺账号: {entry}')
+                    continue
+
+                # 获取店铺名称
+                store_name = dict_store.get(store_username, store_username)
+
+                # 读取订单数据
+                order_list = read_dict_from_file(file_path)
+                log(f'读取店铺 {store_name}({store_username}) 的VSSV订单: {len(order_list)}条')
+
+                # 处理每条订单数据
+                for order in order_list:
+                    # 基础订单信息
+                    order_no = order.get('orderNo', '-')
+                    sub_order_no = order.get('subOrderNo', '-')
+                    purchase_no = order.get('purchaseNo', '-')
+                    skc_img_path = order.get('skcImgPath', '')
+                    skc = order.get('skc', '-')
+                    supplier_product_number = order.get('supplierProductNumber', '-')
+                    skc_num = order.get('skcNum', 0)
+                    order_state_name = order.get('orderStateName', '-')
+                    actual_total_amount = order.get('actualTotalAmount', 0)
+
+                    # 提取扣款单号（从vendorRepairList数组中）
+                    vendor_repair_no = '-'
+                    vendor_repair_list = order.get('vendorRepairList', [])
+                    if vendor_repair_list and len(vendor_repair_list) > 0:
+                        vendor_repair_no = vendor_repair_list[0].get('vendorRepairNo', '-')
+
+                    # 提取创建时间和完成时间（从orderChangeLogVo中）
+                    create_time = '-'
+                    finish_time = '-'
+                    order_change_log = order.get('orderChangeLogVo', [])
+                    for log_item in order_change_log:
+                        if log_item.get('operateType') == 12:  # 创建时间
+                            create_time = log_item.get('operateTime', '-')
+                        elif log_item.get('operateType') == 4:  # 增值订单完成时间
+                            finish_time = log_item.get('operateTime', '-')
+
+                    # 获取增值服务项列表并合并成一个字符串
+                    service_items = order.get('subOrderServiceItemVoList', [])
+                    service_items_text = '-'
+
+                    if service_items:
+                        # 将所有服务项合并成一个字符串，每个服务项一行
+                        service_lines = []
+                        for service_item in service_items:
+                            service_name = service_item.get('serviceItemName', '-')
+                            settlement_qty = service_item.get('settlementQuantity', 0)
+                            item_amount = service_item.get('itemTotalAmount', 0)
+                            price = service_item.get('price', 0)
+                            # 格式：服务项名称 | 数量 | 金额
+                            service_line = f"{service_name}: {settlement_qty}x{price}=¥{item_amount}"
+                            service_lines.append(service_line)
+                        service_items_text = '\n'.join(service_lines)
+
+                    # 添加一行数据
+                    row_item = []
+                    row_item.append(store_username)  # 店铺账号
+                    row_item.append(store_name)  # 店铺名称
+                    row_item.append(order_no)  # 增值服务订单号
+                    row_item.append(sub_order_no)  # 增值服务单号
+                    row_item.append(purchase_no)  # 采购订单号
+                    # row_item.append(skc_img_path)  # SKC图片
+                    row_item.append(skc)  # 平台SKC
+                    row_item.append(supplier_product_number)  # 商家SKC
+                    row_item.append(skc_num)  # SKC数量
+                    row_item.append(vendor_repair_no)  # 扣款单号
+                    row_item.append(order_state_name)  # 订单状态
+                    row_item.append(actual_total_amount)  # 实际总金额
+                    row_item.append(service_items_text)  # 增值服务项（合并）
+                    row_item.append(create_time)  # 创建时间
+                    row_item.append(finish_time)  # 完成时间
+                    excel_data.append(row_item)
+
+        log(f'共收集到 {len(excel_data) - 1} 条VSSV订单数据')
+
+        # 如果没有数据，只有表头，则不生成Excel
+        if len(excel_data) <= 1:
+            log('没有VSSV订单数据，跳过Excel生成')
+            return
+
+        # 写入Excel
+        excel_path = self.config.excel_path
+        sheet_name = f'{last_month}月增值服务列表'
+
+        batch_excel_operations(excel_path, [
+            (sheet_name, 'write', excel_data, ['C', 'D', 'E', 'I']),  # 订单号、单号、采购单号、扣款单号格式化为文本
+            (sheet_name, 'format', self.format_vssv_order_list),
+            ('Sheet1', 'delete')
+        ])
+
+        log(f'VSSV订单列表已写入: {excel_path}')
+
+    def format_vssv_order_list(self, sheet):
+        """
+        格式化VSSV订单列表Excel
+        """
+        beautify_title(sheet)
+        add_borders(sheet)
+        format_to_money(sheet, ['金额', '总金额'])
+        column_to_right(sheet, ['金额', '数量', '总金额'])
+        format_to_datetime(sheet, ['时间'])
+        column_to_left(sheet, ['店铺账号', '订单号', '单号', 'SKC', '增值服务项'])
+        wrap_column(sheet, ['增值服务项'])  # 增值服务项列自动换行
+        autofit_column(sheet, ['店铺名称', '订单状态'])
+        specify_column_width(sheet, ['增值服务订单号', '增值服务单号', '采购订单号', '扣款单号'], 160 / 6)
+        specify_column_width(sheet, ['增值服务项'], 280 / 6)  # 服务项列设置较宽
+
+        # 插入SKC图片
+        # InsertImageV2(sheet, ['SKC图片'], 'shein', 90)
+
+        sheet.autofit()

{qrpa-1.1.37 → qrpa-1.1.39}/qrpa/shein_lib.py

@@ -758,6 +758,63 @@ class SheinLib:
         log(f'Bridge数据刷新完成', self.store_username, self.store_name)
         return data_list
 
+    def get_vssv_order_list(self):
+        """
+        获取VSSV订单列表
+
+        Args:
+            web_page: 页面对象
+            store_username: 店铺账号
+            store_name: 店铺名称
+
+        Returns:
+            list: 订单列表
+        """
+        page_num = 1
+        page_size = 200
+        first_day, last_day = TimeUtils.get_last_month_range()
+
+        cache_file = f'{self.config.auto_dir}/shein/vssv_order/vssv_order_list_{self.store_username}_{first_day}_{last_day}.json'
+        list_item = read_dict_from_file(cache_file, 3600 * 24 * 20)
+        if len(list_item) > 0:
+            return list_item
+
+        url = f"https://sso.geiwohuo.com/vssv/order/page"
+        payload = {
+            "deductionStatus": "2",
+            "beginTime"      : f"{first_day} 00:00:00",
+            "endTime"        : f"{last_day} 23:59:59",
+            "pageNumber"     : page_num,
+            "pageSize"       : page_size
+        }
+        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))
+            raise
+        list_item = response_text['info']['list']
+        total = response_text['info']['count']
+        totalPage = math.ceil(total / page_size)
+
+        for page in range(2, totalPage + 1):
+            log(f'获取VSSV订单列表 第{page}/{totalPage}页')
+            page_num = page
+            payload = {
+                "deductionStatus": "2",
+                "beginTime"      : f"{first_day} 00:00:00",
+                "endTime"        : f"{last_day} 23:59:59",
+                "pageNumber"     : page_num,
+                "pageSize"       : page_size
+            }
+            response_text = fetch(self.web_page, url, payload)
+            spu_list_new = response_text['info']['list']
+            list_item += spu_list_new
+            time.sleep(0.1)
+
+        write_dict_to_file(cache_file, list_item)
+
+        return list_item
+
     def get_replenish_list(self):
         page_num = 1
         page_size = 50
@@ -1225,7 +1282,7 @@ class SheinLib:
 
         # 活动信息
         # AB实验数据
-        
+
         # 预先过滤掉不需要的商品状态
         log(f'过滤前商品数量: {len(spu_list)}')
         exclude_levels = ['退供款', '自主停产', '自主下架']

{qrpa-1.1.37 → qrpa-1.1.39}/qrpa.egg-info/PKG-INFO

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