From 2b54d4e6328b15c9baf82826e4b99078b2ede0f1 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Mon, 15 Sep 2025 15:11:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E5=AF=8C=E5=95=86=E6=88=B7=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/mall_merchant_user.sql | 21 +++ extract_product_codes.py | 127 ++++++++++++++++++ .../constant/IntegratedConstants.java | 7 +- pjcloud-upms/pjcloud-upms-biz/pom.xml | 6 + .../admin/controller/SysRoleController.java | 5 +- 5 files changed, 163 insertions(+), 3 deletions(-) create mode 100644 db/mall_merchant_user.sql create mode 100644 extract_product_codes.py rename pjcloud-integrated/{pjcloud-integrated-biz => pjcloud-integrated-api}/src/main/java/com/bsd/pjcloud/integrated/constant/IntegratedConstants.java (89%) diff --git a/db/mall_merchant_user.sql b/db/mall_merchant_user.sql new file mode 100644 index 00000000..1419957d --- /dev/null +++ b/db/mall_merchant_user.sql @@ -0,0 +1,21 @@ +-- 商户用户绑定表 +CREATE TABLE `mall_merchant_user` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `merchant_id` bigint(20) NOT NULL COMMENT '商户ID', + `user_id` bigint(20) NOT NULL COMMENT '用户ID', + `user_name` varchar(50) DEFAULT NULL COMMENT '用户名称', + `user_phone` varchar(20) DEFAULT NULL COMMENT '用户手机号', + `role_type` tinyint(2) NOT NULL DEFAULT '1' COMMENT '角色类型(1:管理员 2:普通用户)', + `status` tinyint(2) NOT NULL DEFAULT '1' COMMENT '状态(1:启用 0:禁用)', + `create_by` varchar(50) DEFAULT NULL COMMENT '创建者', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_by` varchar(50) DEFAULT NULL COMMENT '更新者', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `del_flag` char(1) DEFAULT '0' COMMENT '是否删除（0=正常 1=删除）', + `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户编号', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_merchant_user` (`merchant_id`, `user_id`, `del_flag`), + KEY `idx_user_id` (`user_id`), + KEY `idx_merchant_id` (`merchant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商户用户绑定表'; + diff --git a/extract_product_codes.py b/extract_product_codes.py new file mode 100644 index 00000000..ccd86e24 --- /dev/null +++ b/extract_product_codes.py @@ -0,0 +1,127 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +""" +Excel货号提取工具 +从Excel文件中提取货号并生成删除SQL +""" + +import pandas as pd +import sys +from pathlib import Path + +def extract_product_codes_and_generate_sql(excel_file_path): + """ + 从Excel文件提取货号并生成删除SQL + """ + try: + # 读取Excel文件 + print(f"正在读取Excel文件: {excel_file_path}") + + # 尝试读取第一个工作表 + df = pd.read_excel(excel_file_path, sheet_name=0) + + print(f"Excel文件包含 {len(df)} 行数据") + print("列名:", list(df.columns)) + + # 寻找货号列 + product_code_column = None + possible_columns = ['货号', 'productCode', 'product_code', '商品编码', '编码'] + + for col in df.columns: + if any(keyword in str(col) for keyword in possible_columns): + product_code_column = col + break + + if product_code_column is None: + print("未找到货号列，请检查Excel文件格式") + print("可用的列:", list(df.columns)) + return + + print(f"找到货号列: {product_code_column}") + + # 提取货号 + product_codes = df[product_code_column].dropna().astype(str).tolist() + product_codes = [code.strip() for code in product_codes if code.strip()] + + print(f"共提取到 {len(product_codes)} 个货号") + + if not product_codes: + print("没有找到有效的货号数据") + return + + # 生成SQL语句 + generate_delete_sql(product_codes) + + except Exception as e: + print(f"处理Excel文件时出错: {str(e)}") + +def generate_delete_sql(product_codes): + """ + 生成删除SQL语句 + """ + # 格式化货号列表 + formatted_codes = [f"'{code}'" for code in product_codes] + codes_str = ',\n '.join(formatted_codes) + + sql_template = f""" +-- 根据货号删除商品及相关数据的SQL语句 +-- 总共 {len(product_codes)} 个货号 + +-- 1. 首先查询要删除的商品ID (用于确认) +SELECT id, product_code, product_name +FROM sm_erp_spu +WHERE product_code IN ( + {codes_str} +); + +-- 2. 删除相关的辅助条码数据 +DELETE FROM sm_erp_auxiliary_code +WHERE spu_id IN ( + SELECT id FROM sm_erp_spu WHERE product_code IN ( + {codes_str} + ) +); + +-- 3. 删除相关的单位数据 +DELETE FROM sm_erp_unit +WHERE spu_id IN ( + SELECT id FROM sm_erp_spu WHERE product_code IN ( + {codes_str} + ) +); + +-- 4. 删除相关的库存数据 +DELETE FROM sm_erp_stock +WHERE erp_spu_id IN ( + SELECT id FROM sm_erp_spu WHERE product_code IN ( + {codes_str} + ) +); + +-- 5. 最后删除商品主表数据 +DELETE FROM sm_erp_spu +WHERE product_code IN ( + {codes_str} +); + +-- 货号列表: +{chr(10).join([f"-- {i+1}. {code}" for i, code in enumerate(product_codes)])} +""" + + # 保存到文件 + with open('delete_products.sql', 'w', encoding='utf-8') as f: + f.write(sql_template) + + print("SQL语句已生成并保存到 delete_products.sql 文件") + print("\n" + "="*50) + print(sql_template) + +if __name__ == "__main__": + # Excel文件路径 + excel_file = "pjcloud-supermarket/pjcloud-supermarket-biz/青少年宫.111xls.xls" + + if not Path(excel_file).exists(): + print(f"Excel文件不存在: {excel_file}") + sys.exit(1) + + extract_product_codes_and_generate_sql(excel_file) \ No newline at end of file diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/constant/IntegratedConstants.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/constant/IntegratedConstants.java similarity index 89% rename from pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/constant/IntegratedConstants.java rename to pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/constant/IntegratedConstants.java index f6616592..10e7ad1a 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/constant/IntegratedConstants.java +++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/constant/IntegratedConstants.java @@ -29,9 +29,14 @@ public interface IntegratedConstants { */ interface RoleCode { /** - * 商户用户角色 + * 共富商户用户角色 */ String MERCHANT_USER = "MALL_MCH"; + + /** + * 合作商家商户校色 + */ + String MCH_USER = "MCH_USER"; /** * 超市管理员角色 diff --git a/pjcloud-upms/pjcloud-upms-biz/pom.xml b/pjcloud-upms/pjcloud-upms-biz/pom.xml index 93ca708b..a1516b60 100644 --- a/pjcloud-upms/pjcloud-upms-biz/pom.xml +++ b/pjcloud-upms/pjcloud-upms-biz/pom.xml @@ -220,6 +220,12 @@ com.bsd pjcloud-flow-task-api + + com.bsd + pjcloud-integrated-api + 5.7.0 + compile + diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysRoleController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysRoleController.java index 4e50e6c3..20b6e50f 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysRoleController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysRoleController.java @@ -41,6 +41,7 @@ import com.bsd.pjcloud.common.security.annotation.HasPermission; import com.bsd.pjcloud.common.security.annotation.Inner; import com.bsd.pjcloud.common.security.service.PjcloudUser; import com.bsd.pjcloud.common.security.util.SecurityUtils; +import com.bsd.pjcloud.integrated.constant.IntegratedConstants; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -182,7 +183,7 @@ public class SysRoleController { Long id = SecurityUtils.getUser().getId(); List sysUserRoles = sysUserRoleService.list(Wrappers.lambdaQuery().eq(SysUserRole::getUserId, id)); List roleIds = sysUserRoles.stream().map(sysUserRole -> sysUserRole.getRoleId()).collect(Collectors.toList()); - List list = sysRoleService.list(Wrappers.lambdaQuery().eq(SysRole::getRoleCode, "MCH_USER")); + List list = sysRoleService.list(Wrappers.lambdaQuery().eq(SysRole::getRoleCode, IntegratedConstants.RoleCode.MCH_USER)); if (CollectionUtils.isEmpty(list) || CollUtil.isEmpty(roleIds) || !roleIds.contains(list.get(0).getRoleId())) { return R.ok(false); } @@ -198,7 +199,7 @@ public class SysRoleController { Long id = SecurityUtils.getUser().getId(); List sysUserRoles = sysUserRoleService.list(Wrappers.lambdaQuery().eq(SysUserRole::getUserId, id)); List roleIds = sysUserRoles.stream().map(sysUserRole -> sysUserRole.getRoleId()).collect(Collectors.toList()); - List list = sysRoleService.list(Wrappers.lambdaQuery().eq(SysRole::getRoleCode, "Mall_MCH_USER")); + List list = sysRoleService.list(Wrappers.lambdaQuery().eq(SysRole::getRoleCode, IntegratedConstants.RoleCode.MERCHANT_USER)); if (CollectionUtils.isEmpty(list) || CollUtil.isEmpty(roleIds) || !roleIds.contains(list.get(0).getRoleId())) { return R.ok(false); }