add getProductDtoListFromProductList method

springWarehouse/src/main/java/com/yen/springWarehouse/controller/ProductController.java

@@ -79,6 +79,7 @@ public String list(@RequestParam(value="pageNo", required=false, defaultValue="1
 
         Page<Product> page = productService.getProductPage(helper, pageNo, PAGE_SIZE);
         map.put("productTypeList", productTypeService.list());
+        map.put("merchantList", merchantService.list());
         map.put("page", page);
         map.put("helper", helper);
         log.info("(ProductController list) map = {}", map);

springWarehouse/src/main/java/com/yen/springWarehouse/dto/ProductDto.java

@@ -0,0 +1,29 @@
+package com.yen.springWarehouse.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProductDto {
+
+    private int id;
+
+    private String name;
+
+    private int typeId;
+
+    private int price;
+
+    private int merchantId;
+
+    private String productStatus;
+
+    private int amount;
+
+    private String productTypeName;
+
+    private String merchantName;
+}

springWarehouse/src/main/java/com/yen/springWarehouse/service/ProductService.java

@@ -3,10 +3,16 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yen.springWarehouse.bean.Product;
+import com.yen.springWarehouse.dto.ProductDto;
 import com.yen.springWarehouse.util.ProductQueryHelper;
 
+import java.util.List;
+
 public interface ProductService extends IService<Product> {
 
     /** Pagination */
     Page<Product> getProductPage(ProductQueryHelper helper, Integer pageNo, Integer pageSize);
+
+    List<ProductDto> getProductDtoListFromProductList(List<Product> productList);
+
 }

springWarehouse/src/main/java/com/yen/springWarehouse/service/impl/ProductServiceImpl.java

@@ -4,17 +4,24 @@
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yen.springWarehouse.bean.Merchant;
 import com.yen.springWarehouse.bean.Product;
+import com.yen.springWarehouse.bean.ProductType;
+import com.yen.springWarehouse.dto.ProductDto;
 import com.yen.springWarehouse.mapper.ProductMapper;
 import com.yen.springWarehouse.mapper.ProductTypeMapper;
+import com.yen.springWarehouse.service.MerchantService;
 import com.yen.springWarehouse.service.ProductService;
+import com.yen.springWarehouse.service.ProductTypeService;
 import com.yen.springWarehouse.util.ProductQueryHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.BeanUtils;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -23,6 +30,12 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
     @Autowired
     ProductTypeMapper productTypeMapper;
 
+    @Autowired
+    MerchantService merchantService;
+
+    @Autowired
+    ProductTypeService productTypeService;
+
     @Override
     public Page<Product> getProductPage(ProductQueryHelper helper, Integer pageNo, Integer pageSize) {
 
@@ -54,6 +67,7 @@ public Page<Product> getProductPage(ProductQueryHelper helper, Integer pageNo, I
 //        );
 
         if(CollectionUtils.isNotEmpty(productList)){
+            //List<ProductDto> productDtoList = getProductDtoListFromProductList(productList);
             page.setRecords(productList);
             return page;
         }
@@ -62,4 +76,22 @@ public Page<Product> getProductPage(ProductQueryHelper helper, Integer pageNo, I
 
     }
 
+    @Override
+    public List<ProductDto> getProductDtoListFromProductList(List<Product> productList) {
+
+        List<ProductDto> productDtoList = productList.stream().map(
+                product -> {
+                    ProductDto productDto = new ProductDto();
+                    Merchant merchant = merchantService.getById(product.getMerchantId());
+                    ProductType productType = productTypeService.getById(product.getTypeId());
+                    BeanUtils.copyProperties(productDto, product);
+                    productDto.setMerchantName(merchant.getName());
+                    productDto.setProductTypeName(productType.getTypeName());
+                    return productDto;
+                }
+        ).collect(Collectors.toList());
+
+        return productDtoList;
+    }
+
 }