From fce1d57c8f3f500f82c029b440ac579cf318da90 Mon Sep 17 00:00:00 2001
From: zhaochencheng <zccbbg@qq.com>
Date: Mon, 2 Jan 2023 15:21:51 +0800
Subject: [PATCH] =?UTF-8?q?prodcut=20sku=E4=B8=80=E8=B5=B7=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cyl/pms/controller/ProductController.java |  2 +-
 .../main/java/com/cyl/pms/convert/ProductConvert.java  |  1 +
 .../main/java/com/cyl/pms/service/ProductService.java  | 10 ++++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductController.java b/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductController.java
index ddbdbc9..d68d890 100644
--- a/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductController.java
+++ b/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductController.java
@@ -63,7 +63,7 @@ public class ProductController extends BaseController {
     @ApiOperation("获取商品信息详细信息")
     @PreAuthorize("@ss.hasPermi('pms:product:query')")
     @GetMapping(value = "/{id}")
-    public ResponseEntity<Product> getInfo(@PathVariable("id") Long id) {
+    public ResponseEntity<ProductVO> getInfo(@PathVariable("id") Long id) {
         return ResponseEntity.ok(service.selectById(id));
     }
 
diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/convert/ProductConvert.java b/ruoyi-mall/src/main/java/com/cyl/pms/convert/ProductConvert.java
index 11f37fe..a050a4a 100644
--- a/ruoyi-mall/src/main/java/com/cyl/pms/convert/ProductConvert.java
+++ b/ruoyi-mall/src/main/java/com/cyl/pms/convert/ProductConvert.java
@@ -14,4 +14,5 @@ public interface ProductConvert  {
 
     List<ProductVO> dos2vos(List<Product> list);
     Product vo2do(ProductVO productVO);
+    ProductVO do2vo(Product product);
 }
diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductService.java b/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductService.java
index b171d54..4d36097 100644
--- a/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductService.java
+++ b/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductService.java
@@ -43,8 +43,14 @@ public class ProductService {
      * @param id 商品信息主键
      * @return 商品信息
      */
-    public Product selectById(Long id) {
-        return productMapper.selectById(id);
+    public ProductVO selectById(Long id) {
+        Product product = productMapper.selectById(id);
+        ProductVO productVO = convert.do2vo(product);
+        QueryWrapper<Sku> qw = new QueryWrapper<>();
+        qw.eq("product_id", product.getId());
+        List<Sku> skus = skuMapper.selectList(qw);
+        productVO.setSkuList(skus);
+        return productVO;
     }
 
     /**