From ab0637e981ab4c85120ccde35ee24ec4abbe3e24 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 17 Oct 2025 17:20:15 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/product/service/impl/ProductMerchantServiceImpl.java | 214 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 136 insertions(+), 78 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/service/impl/ProductMerchantServiceImpl.java b/oying-system/src/main/java/com/oying/modules/pc/product/service/impl/ProductMerchantServiceImpl.java
index 7540a58..94bdb4b 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/service/impl/ProductMerchantServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/service/impl/ProductMerchantServiceImpl.java
@@ -1,34 +1,31 @@
package com.oying.modules.pc.product.service.impl;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ObjUtil;
+import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.oying.exception.EntityExistException;
-import com.oying.exception.EntityNotFoundException;
-import com.oying.modules.pc.product.converter.ProductImageAssembler;
-import com.oying.modules.pc.product.converter.ProductLabelAssembler;
+import com.oying.exception.BadRequestException;
+import com.oying.modules.pc.common.core.constrant.AuditStatusEnum;
import com.oying.modules.pc.product.domain.Product;
+import com.oying.modules.pc.product.domain.ProductAudit;
import com.oying.modules.pc.product.domain.ProductImage;
import com.oying.modules.pc.product.domain.ProductLabel;
-import com.oying.modules.pc.product.domain.dto.ProductImageCreateRequest;
-import com.oying.modules.pc.product.domain.dto.ProductLabelCreateRequest;
-import com.oying.modules.pc.product.domain.dto.ProductMerchantCreateRequest;
-import com.oying.modules.pc.product.domain.dto.ProductMerchantUpdateRequest;
+import com.oying.modules.pc.product.domain.dto.*;
+import com.oying.modules.pc.product.domain.enums.ProductAuditTypeEnum;
+import com.oying.modules.pc.product.domain.enums.ProductCreationType;
import com.oying.modules.pc.product.domain.enums.ProductStatusEnum;
-import com.oying.modules.pc.product.service.ProductImageService;
-import com.oying.modules.pc.product.service.ProductLabelService;
-import com.oying.modules.pc.product.service.ProductMerchantService;
-import com.oying.modules.pc.product.service.ProductService;
-import com.oying.modules.pc.utils.ImageUtils;
+import com.oying.modules.pc.product.service.*;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import java.util.Set;
+@Slf4j
@Service
@RequiredArgsConstructor
public class ProductMerchantServiceImpl implements ProductMerchantService {
@@ -36,59 +33,128 @@
private final ProductService productService;
private final ProductImageService productImageService;
private final ProductLabelService productLabelService;
+ private final ProductAuditService productAuditService;
+ private final ProductCreationContext productCreationService;
+ private final ProductMerchantImagesUpdateProcessor productMerchantImagesUpdateProcessor;
+ private final ProductMerchantLabelUpdateProcessor productMerchantLabelUpdateProcessor;
@Override
@Transactional(rollbackFor = Exception.class)
public void create(ProductMerchantCreateRequest request) {
- Product product = new Product();
- BeanUtils.copyProperties(request, product);
- request.getImages().stream().findFirst().map(ProductImageCreateRequest::getUploadFileId)
- .ifPresent(id -> {
- product.setMainImageId(id.toString());
- product.setMainImageUrl(ImageUtils.getPublicObjectUrl(id));
- });
- product.setStatus(ProductStatusEnum.DRAFT.getValue());
- productService.create(product);
+ productCreationService.createProduct(request, ProductCreationType.DIRECT);
+ }
- List<ProductImage> productImages = request.getImages().stream().map(i -> {
- i.setProductId(product.getProductId());
- return ProductImageAssembler.to(i);
- }).collect(Collectors.toList());
- if (CollectionUtil.isNotEmpty(productImages)) {
- productImageService.saveBatch(productImages);
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void createWithAudit(ProductMerchantCreateRequest request) {
+ productCreationService.createProduct(request, ProductCreationType.WITH_AUDIT);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void submitToAudit(Long productId, ProductAuditTypeEnum productAuditType) {
+ Product existingProduct = productService.getById(productId);
+ if (!ProductStatusEnum.DRAFT.getValue().equals(existingProduct.getStatus())) {
+ throw new BadRequestException("无法提交，该商品已提交审核或已上架");
}
- List<ProductLabel> productLabels = request.getLabels().stream().map(i -> {
- i.setProductId(product.getProductId());
- return ProductLabelAssembler.to(i);
- }).collect(Collectors.toList());
- if (CollectionUtil.isNotEmpty(productLabels)) {
- productLabelService.saveBatch(productLabels);
- }
+ List<ProductImage> productImages = productImageService.queryImagesByProductId(existingProduct.getProductId());
+ existingProduct.setImages(productImages);
+ List<ProductLabel> productLabels = productLabelService.queryLabelsByProductId(existingProduct.getProductId());
+ existingProduct.setLabels(productLabels);
+
+ ProductAudit audit = new ProductAudit();
+ audit.setProductId(existingProduct.getProductId());
+ audit.setType(productAuditType.name());
+ audit.setStatus(AuditStatusEnum.PENDING.getValue());
+ ProductAuditData auditData = new ProductAuditData();
+ auditData.setProduct(existingProduct);
+ audit.setData(JSON.toJSONString(auditData));
+ productAuditService.create(audit);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ProductMerchantUpdateRequest request) {
- Product existingProduct = this.findOrThrow(request.getProductId());
- this.processImagesUpdate(request);
- this.processLabelsUpdate(request);
+
+ Product existingProduct = productService.getProduct(request.getProductId());
+ this.validateAuditStatus(existingProduct.getStatus());
+
+ productMerchantImagesUpdateProcessor.processImagesUpdate(request);
+ productMerchantLabelUpdateProcessor.processLabelsUpdate(request);
BeanUtils.copyProperties(request, existingProduct);
+ existingProduct.setStatus(ProductStatusEnum.PENDING.getValue());
+ existingProduct.setShelfStatus(ProductStatusEnum.NO_AVAILABLE.getValue());
productService.update(existingProduct);
+
+ ProductAudit audit = new ProductAudit();
+ audit.setProductId(existingProduct.getProductId());
+ audit.setType(ProductAuditTypeEnum.FULL_UPDATE.name());
+ audit.setStatus(AuditStatusEnum.PENDING.getValue());
+ ProductAuditData auditData = new ProductAuditData();
+ auditData.setOriginalProduct(existingProduct);
+ Product newProduct = new Product();
+ BeanUtil.copyProperties(request, newProduct, CopyOptions.create().setIgnoreNullValue(true));
+ auditData.setProduct(existingProduct);
+ ProductRevisionRecord revisionRecord = new ProductRevisionRecord();
+ BeanUtil.copyProperties(request, revisionRecord, CopyOptions.create().setIgnoreNullValue(true));
+ auditData.setRevisionRecord(revisionRecord);
+ audit.setData(JSON.toJSONString(auditData));
+ productAuditService.create(audit);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePrice(ProductPriceUpdateRequest request) {
+ Product existingProduct = productService.getProduct(request.getProductId());
+ existingProduct.setPrice(request.getPrice());
+ productService.update(existingProduct, true);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateImages(ProductMerchantUpdateRequest request) {
- this.findOrThrow(request.getProductId());
- this.processImagesUpdate(request);
+ Product existingProduct = productService.getProduct(request.getProductId());
+ this.validateAuditStatus(existingProduct.getStatus());
+ productMerchantImagesUpdateProcessor.processImagesUpdate(request);
+
+ ProductAudit audit = new ProductAudit();
+ audit.setProductId(existingProduct.getProductId());
+ audit.setType(ProductAuditTypeEnum.IMAGE_UPDATE.name());
+ audit.setStatus(AuditStatusEnum.PENDING.getValue());
+ ProductAuditData auditData = new ProductAuditData();
+ auditData.setOriginalProduct(existingProduct);
+ Product newProduct = new Product();
+ BeanUtil.copyProperties(request, newProduct, CopyOptions.create().setIgnoreNullValue(true));
+ auditData.setProduct(existingProduct);
+ ProductRevisionRecord revisionRecord = new ProductRevisionRecord();
+ BeanUtil.copyProperties(request, revisionRecord, CopyOptions.create().setIgnoreNullValue(true));
+ auditData.setRevisionRecord(revisionRecord);
+ audit.setData(JSON.toJSONString(auditData));
+ productAuditService.create(audit);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateLabels(ProductMerchantUpdateRequest request) {
- this.findOrThrow(request.getProductId());
- this.processImagesUpdate(request);
+ Product existingProduct = productService.getProduct(request.getProductId());
+ this.validateAuditStatus(existingProduct.getStatus());
+ productMerchantLabelUpdateProcessor.processLabelsUpdate(request);
+
+ ProductAudit audit = new ProductAudit();
+ audit.setProductId(existingProduct.getProductId());
+ audit.setType(ProductAuditTypeEnum.LABEL_UPDATE.name());
+ audit.setStatus(AuditStatusEnum.PENDING.getValue());
+ ProductAuditData auditData = new ProductAuditData();
+ auditData.setOriginalProduct(existingProduct);
+ Product newProduct = new Product();
+ BeanUtil.copyProperties(request, newProduct, CopyOptions.create().setIgnoreNullValue(true));
+ auditData.setProduct(existingProduct);
+ ProductRevisionRecord revisionRecord = new ProductRevisionRecord();
+ BeanUtil.copyProperties(request, revisionRecord, CopyOptions.create().setIgnoreNullValue(true));
+ auditData.setRevisionRecord(revisionRecord);
+ audit.setData(JSON.toJSONString(auditData));
+ productAuditService.create(audit);
}
@Transactional
@@ -99,51 +165,43 @@
@Override
public void putOnShelf(Long productId) {
+ Product existingProduct = productService.getById(productId);
+ if (ProductStatusEnum.AVAILABLE.getValue().equals(existingProduct.getStatus())) {
+ return;
+ }
+ if (!(ProductStatusEnum.APPROVED.getValue().equals(existingProduct.getStatus())
+ || ProductStatusEnum.NO_AVAILABLE.getValue().equals(existingProduct.getStatus()))) {
+ throw new BadRequestException("无法上架，商品未审核");
+ }
LambdaUpdateWrapper<Product> wrapper = new LambdaUpdateWrapper<Product>()
.eq(Product::getProductId, productId)
- .set(Product::getStatus, ProductStatusEnum.AVAILABLE.getValue());
+ .set(Product::getStatus, ProductStatusEnum.AVAILABLE.getValue())
+ .set(Product::getShelfStatus, ProductStatusEnum.AVAILABLE.getValue());
productService.update(wrapper);
}
@Override
public void takeOffShelf(Long productId) {
+ Product existingProduct = productService.getById(productId);
+ if (ProductStatusEnum.NO_AVAILABLE.getValue().equals(existingProduct.getShelfStatus())) {
+ return;
+ }
+ if (!ProductStatusEnum.AVAILABLE.getValue().equals(existingProduct.getShelfStatus())) {
+ return;
+ }
LambdaUpdateWrapper<Product> wrapper = new LambdaUpdateWrapper<Product>()
.eq(Product::getProductId, productId)
- .set(Product::getStatus, ProductStatusEnum.NO_AVAILABLE.getValue());
+ .set(Product::getStatus, ProductStatusEnum.NO_AVAILABLE.getValue())
+ .set(Product::getShelfStatus, ProductStatusEnum.NO_AVAILABLE.getValue());
productService.update(wrapper);
}
- private Product findOrThrow(Long productId) {
- Product existingProduct = productService.getById(productId);
- if (ObjUtil.isEmpty(existingProduct)) {
- throw new EntityNotFoundException(Product.class, "id", Optional.ofNullable(productId).map(Object::toString).orElse("null"));
- }
- return existingProduct;
- }
-
- private void processImagesUpdate(ProductMerchantUpdateRequest request) {
- if (CollectionUtil.isNotEmpty(request.getDeletedImageIds())) {
- productImageService.deleteAll(request.getDeletedImageIds());
- }
- if (CollectionUtil.isNotEmpty(request.getUpdatedImages())) {
- productImageService.batchUpdate(request.getUpdatedImages());
- }
- if (CollectionUtil.isNotEmpty(request.getNewImages())) {
- List<ProductImageCreateRequest> newImages = request.getNewImages().stream().peek(i-> i.setProductId(request.getProductId())).collect(Collectors.toList());
- productImageService.batchCreate(newImages);
- }
- }
-
- private void processLabelsUpdate(ProductMerchantUpdateRequest request) {
- if (CollectionUtil.isNotEmpty(request.getDeletedLabelIds())) {
- productLabelService.deleteAll(request.getDeletedLabelIds());
- }
- if (CollectionUtil.isNotEmpty(request.getUpdatedLabels())) {
- productLabelService.batchUpdate(request.getUpdatedLabels());
- }
- if (CollectionUtil.isNotEmpty(request.getNewLabels())) {
- List<ProductLabel> newLabels = request.getNewLabels().stream().peek(i-> i.setProductId(request.getProductId())).collect(Collectors.toList());
- productLabelService.batchCreate(newLabels);
+ private void validateAuditStatus(Integer status) {
+ Set<ProductStatusEnum> statusEnumSet = CollectionUtil.newHashSet(ProductStatusEnum.PENDING,
+ ProductStatusEnum.UNDER_REVIEW);
+ ProductStatusEnum existingStatus = ProductStatusEnum.getOrDefault(status, ProductStatusEnum.DRAFT);
+ if (statusEnumSet.contains(existingStatus)) {
+ throw new BadRequestException("商品已在审核流程中无法修改");
}
}
}
--
Gitblit v1.9.3