cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并解决冲突

Browse Source
This commit is contained in:
taozi
2022-10-04 14:25:28 +08:00
parent 1cb99eb1dd
commit ba4414e7c0
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -28,7 +28,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.2</version> <version>2.7.4</version>
</parent> </parent>
<properties> <properties>

9
yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java
View File

@ -112,15 +112,6 @@ public class YxStoreProductAttrServiceImpl extends BaseServiceImpl<StoreProductA
unique = oldAttrValue.getUnique(); unique = oldAttrValue.getUnique();
} }
YxStoreProductAttrValue oldAttrValue = storeProductAttrValueService.getOne(new LambdaQueryWrapper<YxStoreProductAttrValue>()
.eq(YxStoreProductAttrValue::getSku, productFormatDto.getSku())
.eq(YxStoreProductAttrValue::getProductId, productId));
String unique = IdUtil.simpleUUID();
if (Objects.nonNull(oldAttrValue)) {
unique = oldAttrValue.getUnique();
}
YxStoreProductAttrValue yxStoreProductAttrValue = YxStoreProductAttrValue.builder() YxStoreProductAttrValue yxStoreProductAttrValue = YxStoreProductAttrValue.builder()
.id(Objects.isNull(oldAttrValue) ? null : oldAttrValue.getId()) .id(Objects.isNull(oldAttrValue) ? null : oldAttrValue.getId())
.productId(productId) .productId(productId)