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

Merge branch 'feature/bug-1344' into prod/20260317

This commit is contained in:
曹鹏飞 2026-03-17 18:16:20 +08:00
parent 26084b1e1b 4e94408ab2
commit 5e533f4d39
5 changed files with 31 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductHonorServiceImpl.java
View File

@ -44,12 +44,7 @@ public class ProductHonorServiceImpl extends ServiceImpl<ProductHonorMapper, Pro
@Override
public Integer add(ProductHonorAddRequest request) {
ProductHonor productHonor = new ProductHonor()
.setTitle(request.getItems().stream()
.filter(it-> StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE))
.findFirst()
.get()
.getTitle()
.trim())
.setTitle(request.getItems().get(0).getTitle().trim())
.setObtainingTime(request.getObtainingTime())
.setBatchNumber(request.getBatchNumber())
.setEnable(request.getEnable())

14
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductPartServiceImpl.java
View File

@ -42,13 +42,8 @@ public class ProductPartServiceImpl extends ServiceImpl<ProductPartMapper, Produ
@Transactional
@Override
public void add(ProductPartAddRequest request) {
ProductPartInfoAddRequest cn=request.getItems().stream()
.filter(it-> StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE))
.findFirst()
.orElse(null);
VUtils.trueThrowBusinessError(Objects.isNull(cn)).throwMessage("必须包含中文数据");
ProductPart part = new ProductPart()
.setName(cn.getName())
.setName(request.getItems().get(0).getName())
.setAttrId(request.getAttrId())
.setDescribe(request.getDescribe())
.setCreateBy(AdminUserUtil.getUserName())
@ -60,14 +55,9 @@ public class ProductPartServiceImpl extends ServiceImpl<ProductPartMapper, Produ
@Transactional
@Override
public void update(ProductPartUpdateRequest request) {
ProductPartInfoAddRequest cn = request.getItems().stream()
.filter(it -> StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE))
.findFirst()
.orElse(null);
VUtils.trueThrowBusinessError(Objects.isNull(cn)).throwMessage("必须包含中文数据");
lambdaUpdate()
.set(ProductPart::getAttrId, request.getAttrId())
.set(ProductPart::getName, cn.getName())
.set(ProductPart::getName, request.getItems().get(0).getName())
.set(ProductPart::getDescribe, request.getDescribe())
.set(ProductPart::getUpdateBy, AdminUserUtil.getUserName())
.set(ProductPart::getUpdateTime, LocalDateTime.now())

14
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductSeriesServiceImpl.java
View File

@ -51,14 +51,9 @@ public class ProductSeriesServiceImpl extends ServiceImpl<ProductSeriesMapper, P
@Transactional
@Override
public Integer add(ProductSeriesAddRequest request) {
ProductSeriesInfoAddRequest cn=request.getItems().stream()
.filter(it-> StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE))
.findFirst()
.orElse(null);
VUtils.trueThrowBusinessError(Objects.isNull(cn)).throwMessage("必须包含中文数据");
ProductSeries productSeries = new ProductSeries()
.setModuleId(request.getModuleId())
.setName(cn.getName().trim())
.setName(request.getItems().get(0).getName().trim())
.setBatchNumber(IdUtil.getSnowflakeNextIdStr())
.setSort(RandomUtil.randomInt(0,10000))
.setCreateBy(AdminUserUtil.getUserName())
@ -88,13 +83,8 @@ public class ProductSeriesServiceImpl extends ServiceImpl<ProductSeriesMapper, P
save(info);
productSeriesInfoService.add(info.getId(), request.getItems());
} else {
ProductSeriesInfoAddRequest cn = request.getItems().stream()
.filter(it -> StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE))
.findFirst()
.orElse(null);
VUtils.trueThrowBusinessError(Objects.isNull(cn)).throwMessage("必须包含中文数据");
info.setModuleId(request.getModuleId());
info.setName(cn.getName().trim());
info.setName(request.getItems().get(0).getName().trim());
// info.setSort(request.getSort());
info.setUpdateBy(AdminUserUtil.getUserName());
info.setUpdateTime(LocalDateTime.now());

15
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductTypeServiceImpl.java
View File

@ -34,7 +34,6 @@ import java.util.Objects;
* <p>
* 产品中心-产品类型 服务实现类
* </p>
*
* @author 代码生成器生成
* @since 2025
*/
@ -54,16 +53,11 @@ public class ProductTypeServiceImpl extends ServiceImpl<ProductTypeMapper, Produ
@Transactional
@Override
public Integer add(ProductTypeAddRequest request) {
ProductTypeInfoAddRequest cn=request.getItems().stream()
.filter(it-> StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE))
.findFirst()
.orElse(null);
VUtils.trueThrowBusinessError(Objects.isNull(cn)).throwMessage("必须包含中文数据");
ProductType productType = new ProductType()
.setModuleId(request.getModuleId())
.setSeriesNumber(request.getSeriesNumber())
.setBatchNumber(request.getBatchNumber())
.setName(cn.getName().trim())
.setName(request.getItems().get(0).getName().trim())
.setSort(RandomUtil.randomInt(0, 10000))
.setCreateBy(AdminUserUtil.getUserName())
.setCreateTime(LocalDateTime.now());
@ -97,12 +91,7 @@ public class ProductTypeServiceImpl extends ServiceImpl<ProductTypeMapper, Produ
return id;
// baseMapper.copyItems(request.getId(), id);
} else {
ProductTypeInfoAddRequest cn=request.getItems().stream()
.filter(it-> StrUtil.equals(it.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE))
.findFirst()
.orElse(null);
VUtils.trueThrowBusinessError(Objects.isNull(cn)).throwMessage("必须包含中文数据");
info.setName(cn.getName().trim());
info.setName(request.getItems().get(0).getName().trim());
info.setModuleId(request.getModuleId());
info.setSeriesNumber(request.getSeriesNumber());
// info.setSort(request.getSort());

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

@ -28,7 +28,7 @@
<select id="get" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductHonorVO">
SELECT ph.id,YEAR(ph.obtaining_time) AS 'year',phi.title,phi.image
FROM product_honor ph
LEFT JOIN product_honor_info phi ON phi.honor_id=ph.id AND phi.language_code=#{language}
INNER JOIN product_honor_info phi ON phi.honor_id=ph.id AND phi.language_code=#{language}
WHERE ph.enable=1 AND ph.state=1
ORDER BY ph.obtaining_time DESC, ph.id DESC
</select>