From b4d3224898d50b8f1e30b5c8083a520743927282 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 14 Jul 2025 21:08:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java
index 035c778..149958d 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java
@@ -11,11 +11,13 @@
import com.oying.modules.pc.product.service.ProductImageService;
import com.oying.modules.pc.product.service.ProductLabelService;
import com.oying.modules.pc.product.service.ProductService;
+import com.oying.utils.PageResult;
import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -65,7 +67,13 @@
// @PreAuthorize("@el.check('product:list')")
public ResponseEntity<?> getProductsByPage(ProductQueryCriteria criteria) {
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
- return ResponseEntity.ok(R.success(productService.queryAll(criteria, page)));
+ PageResult<Product> pageResult = productService.queryAll(criteria, page);
+ pageResult.getContent().forEach(product -> {
+ Long productId = product.getProductId();
+ product.setImages(productImageService.queryImagesByProductId(productId));
+ product.setLabels(productLabelService.queryLabelsByProductId(productId));
+ });
+ return ResponseEntity.ok(R.success(pageResult));
}
@GetMapping(value = "/{productId}}")
@@ -112,7 +120,7 @@
//@PreAuthorize("@el.check('merchant:product:add')")
public ResponseEntity<?> createProduct(@Validated @RequestBody ProductMerchantCreateRequest request) {
productAdminService.create(request);
- return ResponseEntity.noContent().build();
+ return ResponseEntity.status(HttpStatus.CREATED).build();
}
@PutMapping
--
Gitblit v1.9.3