|  |  | @@ -2,9 +2,12 @@ package com.iformall.service.impl; | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | import com.github.pagehelper.PageHelper; | 
		
	
		
			
			|  |  |  | import com.github.pagehelper.PageInfo; | 
		
	
		
			
			|  |  |  | import com.iformall.domain.po.LevelPackage; | 
		
	
		
			
			|  |  |  | import com.iformall.domain.po.Product; | 
		
	
		
			
			|  |  |  | import com.iformall.enums.EnumProductType; | 
		
	
		
			
			|  |  |  | import com.iformall.mapper.ProductMapper; | 
		
	
		
			
			|  |  |  | import com.iformall.service.ProductService; | 
		
	
		
			
			|  |  |  | import com.iformall.service.sm.LevelPackageService; | 
		
	
		
			
			|  |  |  | import lombok.extern.slf4j.Slf4j; | 
		
	
		
			
			|  |  |  | import org.slf4j.Logger; | 
		
	
		
			
			|  |  |  | import org.slf4j.LoggerFactory; | 
		
	
	
		
			
				|  |  | @@ -12,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; | 
		
	
		
			
			|  |  |  | import org.springframework.stereotype.Service; | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | import java.util.Date; | 
		
	
		
			
			|  |  |  | import java.util.List; | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | @Service | 
		
	
		
			
			|  |  |  | @Slf4j | 
		
	
	
		
			
				|  |  | @@ -20,16 +24,31 @@ public class ProductServiceImpl implements ProductService { | 
		
	
		
			
			|  |  |  | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | @Autowired | 
		
	
		
			
			|  |  |  | ProductMapper productFromMapper; | 
		
	
		
			
			|  |  |  | ProductMapper productMapper; | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | @Autowired | 
		
	
		
			
			|  |  |  | LevelPackageService levelPackageService; | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | @Override | 
		
	
		
			
			|  |  |  | public PageInfo<Product> listAsPage(Product record, Integer pageIndex, Integer pageSize) { | 
		
	
		
			
			|  |  |  | return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> productFromMapper.findList(record)); | 
		
	
		
			
			|  |  |  | return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> productMapper.findList(record)); | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | @Override | 
		
	
		
			
			|  |  |  | public Product getById(Long id) { | 
		
	
		
			
			|  |  |  | return productFromMapper.selectById(id); | 
		
	
		
			
			|  |  |  | return productMapper.selectById(id); | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | @Override | 
		
	
		
			
			|  |  |  | public List<Product> findListDetail(Product record, Integer projectType) { | 
		
	
		
			
			|  |  |  | List<Product> list = productMapper.findList(record); | 
		
	
		
			
			|  |  |  | for (Product prod: list) { | 
		
	
		
			
			|  |  |  | if(EnumProductType.product_2.getCode().equals(prod.getType())){ | 
		
	
		
			
			|  |  |  | LevelPackage levelPackage = levelPackageService.getDetailById(prod.getExtraId(),projectType); | 
		
	
		
			
			|  |  |  | prod.setLevelPackage(levelPackage); | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | return list; | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | } |