From 23ec64ed997fc206fba9f0d6a84975f7b36c47be Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 11 十月 2026 16:09:26 +0800
Subject: [PATCH] 天津-奇缘恒艺 录数据需求修改
---
src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
index ba6b4d6..5a330d7 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
@@ -172,49 +172,51 @@
return deleteCount;
}
+ /** 鍙拌处鎵嬪伐褰曞叆鐨勪骇鍝佸ぇ绫�/瑙勬牸鍨嬪彿缁熶竴鎸傚埌杩欎釜澶х被涓� */
+ private static final String TOP_CATEGORY_NAME = "鎴愬搧";
+
@Override
- public ProductModel ensureProductHierarchy(String productName, String material, String modelName, String unit) {
+ public ProductModel ensureProductHierarchy(String productName, String modelName, String unit) {
productName = StringUtils.trim(productName);
- material = StringUtils.trim(material);
modelName = StringUtils.trim(modelName);
- if (StringUtils.isEmpty(productName) || StringUtils.isEmpty(material) || StringUtils.isEmpty(modelName)) {
+ if (StringUtils.isEmpty(productName) || StringUtils.isEmpty(modelName)) {
return null;
}
- // 鍝佸悕锛氫竴绾уぇ绫伙紙parentId 涓虹┖锛�
+ // 涓�绾уぇ绫伙細鍥哄畾銆屾垚鍝併�嶏紙涓嶅瓨鍦ㄥ垯寤猴級
LambdaQueryWrapper<Product> categoryWrapper = new LambdaQueryWrapper<>();
categoryWrapper.isNull(Product::getParentId)
- .eq(Product::getProductName, productName)
+ .eq(Product::getProductName, TOP_CATEGORY_NAME)
.last("limit 1");
Product category = productMapper.selectOne(categoryWrapper);
if (category == null) {
category = new Product();
- category.setProductName(productName);
+ category.setProductName(TOP_CATEGORY_NAME);
productMapper.insert(category);
}
- // 鏉愯川锛氬ぇ绫讳笅鐨勫瓙绫�
- LambdaQueryWrapper<Product> materialWrapper = new LambdaQueryWrapper<>();
- materialWrapper.eq(Product::getParentId, category.getId())
- .eq(Product::getProductName, material)
+ // 浜岀骇锛氫骇鍝佸ぇ绫伙紙鎴愬搧涓嬬殑瀛愮被锛�
+ LambdaQueryWrapper<Product> nameWrapper = new LambdaQueryWrapper<>();
+ nameWrapper.eq(Product::getParentId, category.getId())
+ .eq(Product::getProductName, productName)
.last("limit 1");
- Product materialProduct = productMapper.selectOne(materialWrapper);
- if (materialProduct == null) {
- materialProduct = new Product();
- materialProduct.setParentId(category.getId());
- materialProduct.setProductName(material);
- productMapper.insert(materialProduct);
+ Product nameProduct = productMapper.selectOne(nameWrapper);
+ if (nameProduct == null) {
+ nameProduct = new Product();
+ nameProduct.setParentId(category.getId());
+ nameProduct.setProductName(productName);
+ productMapper.insert(nameProduct);
}
- // 瑙勬牸鍨嬪彿锛氬瓙绫讳笅鐨勮鏍�
+ // 涓夌骇锛氳鏍煎瀷鍙凤紙浜у搧澶х被涓嬬殑瑙勬牸锛�
LambdaQueryWrapper<ProductModel> modelWrapper = new LambdaQueryWrapper<>();
- modelWrapper.eq(ProductModel::getProductId, materialProduct.getId())
+ modelWrapper.eq(ProductModel::getProductId, nameProduct.getId())
.eq(ProductModel::getModel, modelName)
.last("limit 1");
ProductModel productModel = productModelMapper.selectOne(modelWrapper);
if (productModel == null) {
productModel = new ProductModel();
- productModel.setProductId(materialProduct.getId());
+ productModel.setProductId(nameProduct.getId());
productModel.setModel(modelName);
productModel.setUnit(unit);
productModelMapper.insert(productModel);
--
Gitblit v1.9.3