zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud

Browse Source
This commit is contained in:
dzc committed 2024-12-31 18:43:23 +08:00
2 parents 4d7b7e3fe5 b302738589
commit c60c07dc82
1 file changed
+17 -2
Download Patch File Download Diff File Expand all files Collapse all files
pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketSpuServiceImpl.java
+17 -2
View File
@@ -13,9 +13,11 @@ import com.bsd.pjcloud.supermarket.service.SupermarketUnitService;
import lombok.AllArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* 商品spu
@@ -31,6 +33,7 @@ public class SupermarketSpuServiceImpl extends ServiceImpl<SupermarketSpuMapper,
private final SupermarketAuxiliaryCodeService supermarketAuxiliaryCodeService;
@Override
@Transactional
public R saveSpu(SupermarketSpuEntity supermarketSpu) {
baseMapper.insert(supermarketSpu);
@@ -38,6 +41,7 @@ public class SupermarketSpuServiceImpl extends ServiceImpl<SupermarketSpuMapper,
//新增包装类型
List<SupermarketUnitEntity> supermarketUnitEntityList = supermarketSpu.getSupermarketUnitEntityList();
if (CollectionUtils.isNotEmpty(supermarketUnitEntityList)) {
supermarketUnitEntityList.forEach(supermarketUnitEntity -> supermarketUnitEntity.setSpuId(supermarketSpu.getId()));
supermarketUnitService.saveBatch(supermarketUnitEntityList);
}else {
return R.failed("包装类型不能为空");
@@ -45,6 +49,7 @@ public class SupermarketSpuServiceImpl extends ServiceImpl<SupermarketSpuMapper,
//辅助条码
List<SupermarketAuxiliaryCodeEntity> supermarketAuxiliaryCodeEntityList = supermarketSpu.getSupermarketAuxiliaryCodeEntityList();
if (CollectionUtils.isNotEmpty(supermarketAuxiliaryCodeEntityList)) {
supermarketAuxiliaryCodeEntityList.forEach(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId()));
supermarketAuxiliaryCodeService.saveBatch(supermarketAuxiliaryCodeEntityList);
}else {
return R.failed("辅助条码不能为空");
@@ -54,20 +59,30 @@ public class SupermarketSpuServiceImpl extends ServiceImpl<SupermarketSpuMapper,
}
@Override
@Transactional
public R updateSpuById(SupermarketSpuEntity supermarketSpu) {
baseMapper.updateById(supermarketSpu);
//新增包装类型
List<SupermarketUnitEntity> supermarketUnitEntityList = supermarketSpu.getSupermarketUnitEntityList();
if (CollectionUtils.isNotEmpty(supermarketUnitEntityList)) {
supermarketUnitService.updateBatchById(supermarketUnitEntityList);
//id为null新增
List<SupermarketUnitEntity> insertCollect = supermarketUnitEntityList.stream()
.filter(supermarketUnitEntity -> supermarketUnitEntity.getId() == null).collect(Collectors.toList());
List<SupermarketUnitEntity> updateCollect = supermarketUnitEntityList.stream()
.filter(supermarketUnitEntity -> supermarketUnitEntity.getId() != null).collect(Collectors.toList());
supermarketUnitService.updateBatchById(updateCollect);
supermarketUnitService.saveBatch(insertCollect);
}else {
return R.failed("包装类型不能为空");
}
//辅助条码
List<SupermarketAuxiliaryCodeEntity> supermarketAuxiliaryCodeEntityList = supermarketSpu.getSupermarketAuxiliaryCodeEntityList();
if (CollectionUtils.isNotEmpty(supermarketAuxiliaryCodeEntityList)) {
supermarketAuxiliaryCodeService.updateBatchById(supermarketAuxiliaryCodeEntityList);
List<SupermarketAuxiliaryCodeEntity> insertCollect = supermarketAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() == null).collect(Collectors.toList());
List<SupermarketAuxiliaryCodeEntity> updateCollect = supermarketAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() != null).collect(Collectors.toList());
supermarketAuxiliaryCodeService.saveBatch(insertCollect);
supermarketAuxiliaryCodeService.updateBatchById(updateCollect);
}else {
return R.failed("辅助条码不能为空");
}