| 
					
				 | 
			
			
				@@ -461,12 +461,12 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private void checkOrder(ClientEnum orderGoodsInfo, String orderType, Long orderGoodsInfo1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private void checkOrder(ClientEnum orderGoodsInfo, String orderType, Long userId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 判断是否有待支付订单 如果有返回不可下单 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         OrderSearch search = new OrderSearch(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         search.setOrderClient(orderGoodsInfo.name()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         search.setGoodType(orderType); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        search.setUserId(orderGoodsInfo1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        search.setUserId(userId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         UserOrderVo userOrderVo = userOrderDao.getPendingOrder(search); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (null != userOrderVo) { 
			 |