|  | @@ -6,9 +6,13 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.auth.api.entity.SysUser;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.common.controller.BaseController;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.common.entity.HttpResponseResult;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.mall.common.api.CommonPage;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.mall.common.api.CommonResult;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.mall.common.courier.domain.CourierInfo;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.mall.common.courier.service.CourierService;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.mbg.model.PmsProduct;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.portal.domain.PmsPortalProductDetail;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.portal.dto.ProductSearch;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.portal.dto.ShareProductVo;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.portal.dto.ShareProfitParam;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.portal.service.OmsOrderCourierService;
 | 
	
	
		
			
				|  | @@ -88,4 +92,21 @@ public class OpenShareController extends BaseController {
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +    @ApiOperation(value = "综合搜索、筛选、排序")
 | 
	
		
			
				|  |  | +    @RequestMapping(value = "/product/search", method = RequestMethod.POST)
 | 
	
		
			
				|  |  | +    @ResponseBody
 | 
	
		
			
				|  |  | +    public CommonResult<CommonPage<PmsProduct>> search(@RequestBody ProductSearch search) {
 | 
	
		
			
				|  |  | +        List<PmsProduct> productList = portalProductService.search(search.getKeyword(),search.getBrandId(),search.getProductCategoryId(),
 | 
	
		
			
				|  |  | +                                                                   search.getProductAttributeCategoryId(), search.getPageNum(), search.getPageSize(), search.getSort());
 | 
	
		
			
				|  |  | +        return CommonResult.success(CommonPage.restPage(productList));
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    @ApiOperation("获取前台商品详情")
 | 
	
		
			
				|  |  | +    @RequestMapping(value = "/product/detail/{id}", method = RequestMethod.GET)
 | 
	
		
			
				|  |  | +    @ResponseBody
 | 
	
		
			
				|  |  | +    public CommonResult<PmsPortalProductDetail> detail(@PathVariable Long id) {
 | 
	
		
			
				|  |  | +        PmsPortalProductDetail productDetail = portalProductService.detail(id);
 | 
	
		
			
				|  |  | +        return CommonResult.success(productDetail);
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  |  }
 |