Commit 4fe99f10 authored by 王业雄's avatar 王业雄

渠道路由新增判重

parent 3fe23a79
...@@ -138,8 +138,7 @@ public class ChannelRouteController { ...@@ -138,8 +138,7 @@ public class ChannelRouteController {
if (bindingResult.hasErrors()){ if (bindingResult.hasErrors()){
return GlobalResponse.error(bindingResult.getFieldError().getDefaultMessage()); return GlobalResponse.error(bindingResult.getFieldError().getDefaultMessage());
} }
channelRouteService.addChannelConfig(channelRouteAddVo.getChannelRouteSaveVoList(),channelRouteAddVo.getType()); return channelRouteService.addChannelConfig(channelRouteAddVo.getChannelRouteSaveVoList(),channelRouteAddVo.getType());
return GlobalResponse.success();
} }
/** /**
......
...@@ -23,7 +23,7 @@ public interface IChannelRouteService { ...@@ -23,7 +23,7 @@ public interface IChannelRouteService {
FundProInfoVo getFundProductInfo(Long fundId, Long fundCorpId); FundProInfoVo getFundProductInfo(Long fundId, Long fundCorpId);
void addChannelConfig(List<ChannelRouteSaveVo> channelRouteSaveVoList,Integer type); GlobalResponse addChannelConfig(List<ChannelRouteSaveVo> channelRouteSaveVoList,Integer type);
void publishChannelConfig(Long channelId); void publishChannelConfig(Long channelId);
......
...@@ -171,12 +171,18 @@ public class ChannelRouteServiceImpl implements IChannelRouteService { ...@@ -171,12 +171,18 @@ public class ChannelRouteServiceImpl implements IChannelRouteService {
@Override @Override
@Transactional @Transactional
public void addChannelConfig(List<ChannelRouteSaveVo> channelRouteSaveVoList,Integer type) { public GlobalResponse addChannelConfig(List<ChannelRouteSaveVo> channelRouteSaveVoList,Integer type) {
/** /**
* 编辑时要去掉所有该渠道有效性为0的其他配置(覆盖之前的未更新编辑信息) * 编辑时要去掉所有该渠道有效性为0的其他配置(覆盖之前的未更新编辑信息)
*/ */
if ( 0 != type ){ if ( 0 != type ){
channelRuleRepository.deleteAllByChannelIdEqualsAndEnableEquals(channelRouteSaveVoList.get(0).getChannelId(),Boolean.FALSE); channelRuleRepository.deleteAllByChannelIdEqualsAndEnableEquals(channelRouteSaveVoList.get(0).getChannelId(),Boolean.FALSE);
}else if ( 1 == type){
//新增判重
List<ChannelRuleEntity> all = channelRuleRepository.getAllByChannelIdEqualsAndEnableEquals(channelRouteSaveVoList.get(0).getChannelId(), Boolean.TRUE);
if (!CollectionUtils.isEmpty(all)){
return GlobalResponse.error("该渠道已经新增过了");
}
} }
List<ChannelRuleEntity> channelRuleEntityList = getChannelRuleEntityList(channelRouteSaveVoList); List<ChannelRuleEntity> channelRuleEntityList = getChannelRuleEntityList(channelRouteSaveVoList);
...@@ -196,6 +202,7 @@ public class ChannelRouteServiceImpl implements IChannelRouteService { ...@@ -196,6 +202,7 @@ public class ChannelRouteServiceImpl implements IChannelRouteService {
channelRuleRepository.save(channelRuleEntity); channelRuleRepository.save(channelRuleEntity);
} }
}); });
return GlobalResponse.success();
} }
private List<ChannelRuleEntity> getChannelRuleEntityList(List<ChannelRouteSaveVo> channelRouteSaveVoList){ private List<ChannelRuleEntity> getChannelRuleEntityList(List<ChannelRouteSaveVo> channelRouteSaveVoList){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment