| 
						
						
							
								
							
						
						
					 | 
					@ -220,19 +220,19 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							// 单位积分
 | 
					 | 
					 | 
							// 单位积分
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							if (!e.getPoint().equals(f.getPoint())){ | 
					 | 
					 | 
							if (!e.getPoint().equals(f.getPoint())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								String s = String.format(StrConstant.POINT_CHANGE, "单位积分", f.getPoint()); | 
					 | 
					 | 
								String s = String.format(StrConstant.POINT_CHANGE, "单位积分", f.getPoint()); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
								sb.append(s); | 
					 | 
					 | 
								sb.append(s).append(","); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
								appendStatus = true; | 
					 | 
					 | 
								appendStatus = true; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							} | 
					 | 
					 | 
							} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							// 积分上限
 | 
					 | 
					 | 
							// 积分上限
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							if (!e.getUpLimit().equals(f.getUpLimit())){ | 
					 | 
					 | 
							if (!e.getUpLimit().equals(f.getUpLimit())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								String s = String.format(StrConstant.POINT_CHANGE, "积分上限", f.getUpLimit()); | 
					 | 
					 | 
								String s = String.format(StrConstant.POINT_CHANGE, "积分上限", f.getUpLimit()); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
								sb.append(s); | 
					 | 
					 | 
								sb.append(s).append(","); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
								appendStatus = true; | 
					 | 
					 | 
								appendStatus = true; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							} | 
					 | 
					 | 
							} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							// 积分说明
 | 
					 | 
					 | 
							// 积分说明
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							if (!e.getRuleDesc().equals(f.getRuleDesc())){ | 
					 | 
					 | 
							if (!e.getRuleDesc().equals(f.getRuleDesc())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								String s = String.format(StrConstant.POINT_CHANGE, "积分说明", f.getRuleDesc()); | 
					 | 
					 | 
								String s = String.format(StrConstant.POINT_CHANGE, "积分说明", f.getRuleDesc()); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
								sb.append(s); | 
					 | 
					 | 
								sb.append(s).append(","); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
								appendStatus = true; | 
					 | 
					 | 
								appendStatus = true; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							} | 
					 | 
					 | 
							} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							// 规则启用
 | 
					 | 
					 | 
							// 规则启用
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -244,13 +244,13 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							} | 
					 | 
					 | 
							} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							if(!status.toString().equals(f.getEnabledFlag())){ | 
					 | 
					 | 
							if(!status.toString().equals(f.getEnabledFlag())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								String s = String.format(StrConstant.POINT_CHANGE, "规则启用", f.getEnabledFlag()); | 
					 | 
					 | 
								String s = String.format(StrConstant.POINT_CHANGE, "规则启用", f.getEnabledFlag()); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
								sb.append(s); | 
					 | 
					 | 
								sb.append(s).append(","); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
								appendStatus = true; | 
					 | 
					 | 
								appendStatus = true; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							} | 
					 | 
					 | 
							} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							// 积分事件
 | 
					 | 
					 | 
							// 积分事件
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							if (!e.getRuleName().equals(f.getRuleName())){ | 
					 | 
					 | 
							if (!e.getRuleName().equals(f.getRuleName())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								String s = String.format(StrConstant.POINT_CHANGE, "积分事件", f.getRuleName()); | 
					 | 
					 | 
								String s = String.format(StrConstant.POINT_CHANGE, "积分事件", f.getRuleName()); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
								sb.append(s); | 
					 | 
					 | 
								sb.append(s).append(","); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
								appendStatus = true; | 
					 | 
					 | 
								appendStatus = true; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							} | 
					 | 
					 | 
							} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							if (!appendStatus){ | 
					 | 
					 | 
							if (!appendStatus){ | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |