| 
						
						
							
								
							
						
						
					 | 
					@ -205,10 +205,13 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl<PointAdditiveR | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        return new Result<PointAdditiveRuleDTO>().ok(result); | 
					 | 
					 | 
					        return new Result<PointAdditiveRuleDTO>().ok(result); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					    @Transactional(rollbackFor = Exception.class) | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    @Override | 
					 | 
					 | 
					    @Override | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    public Result modify(PointModifyFormDTO dto) { | 
					 | 
					 | 
					    public Result modify(PointModifyFormDTO dto) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        PointAdditiveRuleEntity entity = baseDao.selectById(dto.getId()); | 
					 | 
					 | 
					        PointAdditiveRuleEntity entity = baseDao.selectById(dto.getId()); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					
 | 
					 | 
					 | 
					        if(entity == null){ | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到相关信息","未查到相关信息"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        if(PointAddRuleEnum.CATEGORY_TYPE.getCode().equals(dto.getType())){ | 
					 | 
					 | 
					        if(PointAddRuleEnum.CATEGORY_TYPE.getCode().equals(dto.getType())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            //类别
 | 
					 | 
					 | 
					            //类别
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getCustomerId(),dto.getCategoryName(),null); | 
					 | 
					 | 
					            PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getCustomerId(),dto.getCategoryName(),null); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -216,6 +219,9 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl<PointAdditiveR | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该名称已存在","该名称已存在"); | 
					 | 
					 | 
					                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该名称已存在","该名称已存在"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            } | 
					 | 
					 | 
					            } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            entity.setCategoryName(dto.getCategoryName()); | 
					 | 
					 | 
					            entity.setCategoryName(dto.getCategoryName()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            if(StringUtils.isNotBlank(dto.getApplyFlag())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                entity.setApplyFlag(dto.getApplyFlag()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        }else if(PointAddRuleEnum.RULE_TYPE.getCode().equals(dto.getType())){ | 
					 | 
					 | 
					        }else if(PointAddRuleEnum.RULE_TYPE.getCode().equals(dto.getType())){ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            //规则
 | 
					 | 
					 | 
					            //规则
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getCustomerId(),null,dto.getRuleName()); | 
					 | 
					 | 
					            PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getCustomerId(),null,dto.getRuleName()); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |