| 
					
				 | 
			
			
				@@ -668,7 +668,7 @@ public class PayController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             integralRule.setOilName(infoMap.get("oilName").toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             //获取该油站的积分规则 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             List<IntegralRule> rule = integralRuleService.getIntegralRule(integralRule); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            if(rule !=null && rule.size() > 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            if(rule !=null && rule.size() > 0 && rule.get(0).getEmptyDate().compareTo(new Date()) ==1){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 CustomerPoints customerPoints = new CustomerPoints();       //客户积分实体表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 CustomerPointsRecord customerPointsRecord = new CustomerPointsRecord();     //客户积分记录实体表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 if(infoMap.containsKey("unionId")){ 
			 |