From 3c9e545c80af5515264f28dd60c46b1147281581 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Wed, 17 Sep 2025 20:17:33 +0800
Subject: [PATCH] docs（ProductInventoryService）：给类中方法添加注释
---
oying-system/src/main/java/com/oying/modules/pc/product/service/impl/ProductMerchantServiceImpl.java | 53 +++++++++++++++++++++++++++++++----------------------
1 files changed, 31 insertions(+), 22 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 583047a..e4eef20 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,10 +1,9 @@
package com.oying.modules.pc.product.service.impl;
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.BadRequestException;
-import com.oying.exception.EntityNotFoundException;
import com.oying.modules.pc.common.core.constrant.AuditStatusEnum;
import com.oying.modules.pc.product.converter.ProductImageAssembler;
import com.oying.modules.pc.product.converter.ProductLabelAssembler;
@@ -12,6 +11,7 @@
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.ProductAuditData;
import com.oying.modules.pc.product.domain.dto.ProductImageCreateRequest;
import com.oying.modules.pc.product.domain.dto.ProductMerchantCreateRequest;
import com.oying.modules.pc.product.domain.dto.ProductMerchantUpdateRequest;
@@ -28,7 +28,6 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
-import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -75,8 +74,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ProductMerchantUpdateRequest request) {
- Product existingProduct = this.findOrThrow(request.getProductId());
- this.validateApprovedStatus(existingProduct.getStatus());
+ Product existingProduct = productService.getProduct(request.getProductId());
+ this.validateApprovedStatus(existingProduct.getShelfStatus());
this.processImagesUpdate(request);
this.processLabelsUpdate(request);
BeanUtils.copyProperties(request, existingProduct);
@@ -86,18 +85,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void updateImages(ProductMerchantUpdateRequest request) {
- Product existingProduct = this.findOrThrow(request.getProductId());
- this.validateApprovedStatus(existingProduct.getStatus());
- this.findOrThrow(request.getProductId());
+ Product existingProduct = productService.getProduct(request.getProductId());
+ this.validateApprovedStatus(existingProduct.getShelfStatus());
this.processImagesUpdate(request);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateLabels(ProductMerchantUpdateRequest request) {
- Product existingProduct = this.findOrThrow(request.getProductId());
- this.validateApprovedStatus(existingProduct.getStatus());
- this.findOrThrow(request.getProductId());
+ Product existingProduct = productService.getProduct(request.getProductId());
+ this.validateApprovedStatus(existingProduct.getShelfStatus());
this.processImagesUpdate(request);
}
@@ -109,10 +106,22 @@
@Override
public void putOnShelf(Long productId) {
+ Product existingProduct = productService.getById(productId);
+ if (ProductStatusEnum.AVAILABLE.getValue().equals(existingProduct.getShelfStatus())) {
+ throw new BadRequestException("商品已上架");
+ }
+
+ if (productAuditService.hasPendingByStoreId(productId)) {
+ throw new BadRequestException("已在审核中");
+ }
+
ProductAudit audit = new ProductAudit();
audit.setProductId(productId);
audit.setType(ProductChangeTypeEnum.PUT_ON_SHELF.name());
audit.setStatus(AuditStatusEnum.PENDING.getValue());
+ ProductAuditData auditData = new ProductAuditData();
+ auditData.setOriginalStore(existingProduct);
+ audit.setData(JSON.toJSONString(auditData));
productAuditService.create(audit);
LambdaUpdateWrapper<Product> wrapper = new LambdaUpdateWrapper<Product>()
.eq(Product::getProductId, productId)
@@ -122,9 +131,14 @@
@Override
public void takeOffShelf(Long productId) {
+ Product existingProduct = productService.getById(productId);
+ if (ProductStatusEnum.NO_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);
}
@@ -141,14 +155,6 @@
} catch (Exception e) {
log.error("处理商品审核结果异常", e);
}
- }
-
- 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) {
@@ -179,11 +185,14 @@
private void handlePutOnShelfAuditEvent(ProductAudit audit) {
AuditStatusEnum auditStatus = AuditStatusEnum.get(audit.getStatus());
+ Product existingProduct = productService.getById(audit.getProductId());
if (AuditStatusEnum.APPROVED.equals(auditStatus)) {
- Product existingProduct = productService.getById(audit.getProductId());
+ existingProduct.setStatus(ProductStatusEnum.AVAILABLE.getValue());
+ existingProduct.setShelfStatus(ProductStatusEnum.AVAILABLE.getValue());
+ } else {
existingProduct.setStatus(auditStatus.getValue());
- productService.updateById(existingProduct);
}
+ productService.updateById(existingProduct);
}
private void validateApprovedStatus(Integer status) {
--
Gitblit v1.9.3