rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 甲方提出的一些问题

This commit is contained in:
曹鹏飞 2025-07-08 12:01:11 +08:00
parent d9fc10fe8e
commit 247f3dfeef
6 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/ProductModelParamsMapper.java
View File

@ -24,4 +24,6 @@ public interface ProductModelParamsMapper extends BaseMapper<ProductModelParams>
void copyItems(Integer oldId, Integer newId);
List<ProductParamsItemVO> getMainListByLanguage(Integer modelId, String language);
List<ProductModelParamVO> getCompareListByLanguage(Integer modelId, String language);
}

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelParamsService.java
View File

@ -52,4 +52,6 @@ public interface IProductModelParamsService extends IService<ProductModelParams>
List<ProductModelMainParamsItemChildrenVO> getCNList(Integer modelId);
List<ProductParamsItemVO> getMainListByLanguage(Integer modelId, String language);
List<ProductModelParamVO> getCompareListByLanguage(Integer modelId, String language);
}

5
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java
View File

@ -240,4 +240,9 @@ public class ProductModelParamsServiceImpl extends ServiceImpl<ProductModelParam
public List<ProductParamsItemVO> getMainListByLanguage(Integer modelId, String language) {
return baseMapper.getMainListByLanguage(modelId,language);
}
@Override
public List<ProductModelParamVO> getCompareListByLanguage(Integer modelId, String language) {
return baseMapper.getCompareListByLanguage(modelId,language);
}
}

4
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.nflg.mobilebroken.repository.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -199,6 +198,7 @@ public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, Pro
.eq(ProductModel::getTypeNumber, typeNumber)
.eq(ProductModel::getEnable, true)
.eq(ProductModel::getState, PublishState.Published.getState())
.orderByAsc(ProductModel::getSort)
.list();
if (CollectionUtil.isNotEmpty(list)){
return list.stream().map(item -> new ProductModelVO()
@ -407,6 +407,6 @@ public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, Pro
.setId(productModel.getId())
.setNo(productModel.getNo())
.setImage(productModel.getImage())
.setParams(productPartParamsService.getAllListByLanguage(modelId, language));
.setParams(productPartParamsService.getCompareListByLanguage(modelId, language));
}
}

11
nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelParamsMapper.xml
View File

@ -41,4 +41,15 @@
AND pmpi.language_code = #{language}
ORDER BY pmp.id DESC
</select>
<select id="getCompareListByLanguage" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductModelParamVO">
SELECT pmpi.index_name, pmpi.`name`, pmpi.`value`
FROM product_model_params pmp
INNER JOIN product_model_params_item pmpi ON pmp.id = pmpi.model_params_id
WHERE pmp.model_id = #{modelId}
AND pmp.state = 1
AND pmpi.compare = 1
AND pmpi.language_code = #{language}
ORDER BY pmpi.id
</select>
</mapper>

2
nflg-mobilebroken-repository/src/main/resources/mapper/ProductSeriesMapper.xml
View File

@ -31,7 +31,7 @@
FROM product_series ps
LEFT JOIN product_series_info psi ON psi.series_id = ps.id AND psi.language_code = #{language}
WHERE ps.state = 1 AND ps.enable = 1 AND ps.module_id = #{moduleId}
ORDER BY ps.sort DESC
ORDER BY ps.sort
</select>
<select id="copyItems">