| 
					
				 | 
			
			
				@@ -18,10 +18,7 @@ import com.yonge.cooleshow.mbg.model.OmsOrderCourier; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.yonge.cooleshow.mbg.model.PmsProduct; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.yonge.cooleshow.portal.domain.OmsOrderDetail; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.yonge.cooleshow.portal.domain.PmsPortalProductDetail; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.yonge.cooleshow.portal.dto.OrderCreate; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-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.dto.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.yonge.cooleshow.portal.service.OmsOrderCourierService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.yonge.cooleshow.portal.service.OmsPortalOrderService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.yonge.cooleshow.portal.service.PmsPortalProductService; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -113,6 +110,13 @@ public class OpenShareController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return CommonResult.success(CommonPage.restPage(productList)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @ApiOperation("获取商品列表下拉条件") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @RequestMapping(value = "/search/condition", method = RequestMethod.GET) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @ResponseBody 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public CommonResult<ProductSearchConditionVo> searchCondition() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        ProductSearchConditionVo list = portalProductService.searchCondition(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return CommonResult.success(list); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @ApiOperation("获取前台商品详情") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @RequestMapping(value = "/product/detail/{id}", method = RequestMethod.GET) 
			 |