From 548bead175143ab846aaf0816f2ff1129050e94a Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 21 Jul 2025 16:20:40 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java
index 38a2427..0e2ec45 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductCustomerController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.modules.pc.product.domain.Product;
import com.oying.modules.pc.product.domain.dto.ProductQueryCriteria;
+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.ProductService;
@@ -18,7 +19,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -55,6 +55,7 @@
criteria.setCategoryId(categoryId);
criteria.setSecondCategoryId(secondCategoryId);
criteria.setBlurry(blurry);
+ criteria.setShelfStatus(ProductStatusEnum.AVAILABLE.getValue());
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
PageResult<Product> productPageResult = productService.queryAll(criteria, page);
@@ -75,6 +76,9 @@
/*@PreAuthorize("@el.check('merchant:product:byProductId')")*/
public ResponseEntity<?> getProductDetails(@PathVariable Long productId) {
Product product = productService.getById(productId);
+ if (ObjUtil.isEmpty(product)) {
+ return ResponseEntity.ok(R.success());
+ }
ProductCustomerView customerView = new ProductCustomerView();
BeanUtil.copyProperties(product, customerView);
if (ObjUtil.isNotEmpty(product)) {
--
Gitblit v1.9.3