|
@@ -41,7 +41,7 @@ import java.util.Objects;
|
|
|
import java.util.function.Function;
|
|
import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
-import static com.poyee.enums.ProductTypeEnum.getByCode;
|
|
|
|
|
|
|
+import static com.poyee.enums.ProductTypeEnum.fromCode;
|
|
|
|
|
|
|
|
@Component
|
|
@Component
|
|
|
@AllArgsConstructor
|
|
@AllArgsConstructor
|
|
@@ -100,12 +100,12 @@ public class ProductInfoFacade implements IProductInfoFacade {
|
|
|
@Override
|
|
@Override
|
|
|
public ProductDetailRes detail(String sku) {
|
|
public ProductDetailRes detail(String sku) {
|
|
|
ProductInfo productInfo = productInfo(sku);
|
|
ProductInfo productInfo = productInfo(sku);
|
|
|
- ProductTypeEnum productTypeEnum = getByCode(productInfo.getProductType());
|
|
|
|
|
|
|
+ ProductTypeEnum productTypeEnum = fromCode(productInfo.getProductType());
|
|
|
ProductMedia productMedia = productMediaService.lambdaQuery().eq(ProductMedia::getRelationSku, productInfo.getSku()).one();
|
|
ProductMedia productMedia = productMediaService.lambdaQuery().eq(ProductMedia::getRelationSku, productInfo.getSku()).one();
|
|
|
Assert.notNull(productMedia, "the_product_image_does_not_exist");
|
|
Assert.notNull(productMedia, "the_product_image_does_not_exist");
|
|
|
List<String> otherImages = StrUtil.isNotBlank(productMedia.getOtherImages()) ?
|
|
List<String> otherImages = StrUtil.isNotBlank(productMedia.getOtherImages()) ?
|
|
|
Arrays.asList(productMedia.getOtherImages().split(",")) : Lists.newArrayList();
|
|
Arrays.asList(productMedia.getOtherImages().split(",")) : Lists.newArrayList();
|
|
|
- if (Objects.equals(productTypeEnum, ProductTypeEnum.TRADING_CARD)) {
|
|
|
|
|
|
|
+ if (Objects.equals(productTypeEnum, ProductTypeEnum.STAR_CARD)) {
|
|
|
CardAttribute cardAttribute = cardAttributeService.lambdaQuery().eq(CardAttribute::getRelationSku, productInfo.getSku()).one();
|
|
CardAttribute cardAttribute = cardAttributeService.lambdaQuery().eq(CardAttribute::getRelationSku, productInfo.getSku()).one();
|
|
|
Assert.notNull(cardAttribute, "The_product_attribute_does_not_exist");
|
|
Assert.notNull(cardAttribute, "The_product_attribute_does_not_exist");
|
|
|
return ProductDetailRes.builder()
|
|
return ProductDetailRes.builder()
|
|
@@ -207,7 +207,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
|
|
|
|
|
|
|
|
if (Objects.isNull(existingFastSale)) {
|
|
if (Objects.isNull(existingFastSale)) {
|
|
|
ProductFastSale newFastSale = ProductFastSale.builder()
|
|
ProductFastSale newFastSale = ProductFastSale.builder()
|
|
|
- .saleType(Objects.nonNull(fastSaleReq.getSaleTime()) ? SaleTypeEnum.PRESALE.getCode() : SaleTypeEnum.SPOT_TRADING.getCode())
|
|
|
|
|
|
|
+ .saleType(Objects.nonNull(fastSaleReq.getSaleTime()) ? SaleTypeEnum.PRE_SALE.getCode() : SaleTypeEnum.SPOT.getCode())
|
|
|
.sku(fastSaleReq.getSku())
|
|
.sku(fastSaleReq.getSku())
|
|
|
.recycleFlag(BooleanUtil.isTrue(fastSaleReq.getRecycleFlag()) ? StatusEnum.TRUE.getCode() : StatusEnum.FALSE.getCode())
|
|
.recycleFlag(BooleanUtil.isTrue(fastSaleReq.getRecycleFlag()) ? StatusEnum.TRUE.getCode() : StatusEnum.FALSE.getCode())
|
|
|
.recycleInventory(fastSaleReq.getRecycleInventory())
|
|
.recycleInventory(fastSaleReq.getRecycleInventory())
|
|
@@ -219,7 +219,7 @@ public class ProductInfoFacade implements IProductInfoFacade {
|
|
|
productInfo.setFastSaleFlag(StatusEnum.TRUE.getCode());
|
|
productInfo.setFastSaleFlag(StatusEnum.TRUE.getCode());
|
|
|
return this.productInfoService.updateById(productInfo);
|
|
return this.productInfoService.updateById(productInfo);
|
|
|
} else {
|
|
} else {
|
|
|
- existingFastSale.setSaleType(Objects.nonNull(fastSaleReq.getSaleTime()) ? SaleTypeEnum.PRESALE.getCode() : SaleTypeEnum.SPOT_TRADING.getCode());
|
|
|
|
|
|
|
+ existingFastSale.setSaleType(Objects.nonNull(fastSaleReq.getSaleTime()) ? SaleTypeEnum.PRE_SALE.getCode() : SaleTypeEnum.SPOT.getCode());
|
|
|
existingFastSale.setRecycleFlag(BooleanUtil.isTrue(fastSaleReq.getRecycleFlag()) ? StatusEnum.TRUE.getCode() : StatusEnum.FALSE.getCode());
|
|
existingFastSale.setRecycleFlag(BooleanUtil.isTrue(fastSaleReq.getRecycleFlag()) ? StatusEnum.TRUE.getCode() : StatusEnum.FALSE.getCode());
|
|
|
existingFastSale.setRecycleInventory(fastSaleReq.getRecycleInventory());
|
|
existingFastSale.setRecycleInventory(fastSaleReq.getRecycleInventory());
|
|
|
existingFastSale.setSaleTime(fastSaleReq.getSaleTime());
|
|
existingFastSale.setSaleTime(fastSaleReq.getSaleTime());
|
|
@@ -232,13 +232,13 @@ public class ProductInfoFacade implements IProductInfoFacade {
|
|
|
@Transactional
|
|
@Transactional
|
|
|
@Override
|
|
@Override
|
|
|
public Boolean add(ProductInfoAddReq productInfoAddReq) {
|
|
public Boolean add(ProductInfoAddReq productInfoAddReq) {
|
|
|
- ProductTypeEnum productTypeEnum = getByCode(productInfoAddReq.getProductType());
|
|
|
|
|
|
|
+ ProductTypeEnum productTypeEnum = fromCode(productInfoAddReq.getProductType());
|
|
|
sysDictDataService.validateOptions(ProductConstant.DICT_KEY_PRODUCT_TYPE, StrUtil.toString(productInfoAddReq.getProductType()));
|
|
sysDictDataService.validateOptions(ProductConstant.DICT_KEY_PRODUCT_TYPE, StrUtil.toString(productInfoAddReq.getProductType()));
|
|
|
sysDictDataService.validateOptions(ProductConstant.DICT_KEY_LABEL, StrUtil.toString(productInfoAddReq.getLabelKey()));
|
|
sysDictDataService.validateOptions(ProductConstant.DICT_KEY_LABEL, StrUtil.toString(productInfoAddReq.getLabelKey()));
|
|
|
String sku = SKU_PREFIX + IdUtil.getSnowflakeNextId() % 1000000000000000000L;
|
|
String sku = SKU_PREFIX + IdUtil.getSnowflakeNextId() % 1000000000000000000L;
|
|
|
ProductInfo productInfo;
|
|
ProductInfo productInfo;
|
|
|
switch (productTypeEnum) {
|
|
switch (productTypeEnum) {
|
|
|
- case TRADING_CARD:
|
|
|
|
|
|
|
+ case STAR_CARD:
|
|
|
CardAttribute cardAttribute = CardAttribute.builder()
|
|
CardAttribute cardAttribute = CardAttribute.builder()
|
|
|
.year(productInfoAddReq.getYear())
|
|
.year(productInfoAddReq.getYear())
|
|
|
.sport(productInfoAddReq.getSport())
|
|
.sport(productInfoAddReq.getSport())
|