Commit a9a0a33e authored by liwenbin's avatar liwenbin

type默认为0,添加配置也清楚缓存,解决fundProId前端传空字符串的问题

parent 214b3e98
...@@ -68,7 +68,8 @@ public class FundModuleChannelFundConfigServiceImpl implements IFundModuleChanne ...@@ -68,7 +68,8 @@ public class FundModuleChannelFundConfigServiceImpl implements IFundModuleChanne
result.put("list", channelFundConfigs.getContent()); result.put("list", channelFundConfigs.getContent());
return result; return result;
} }
@CacheEvict(value = "cacheManager", key="'ASSET_DISTRIBUTION:FUND_MODULE:CHANNEL_FUND_CONFIG:AC8A_'+#bizChannel")
@Override @Override
public GlobalResponse addChannelFundConfig(String bizChannel, String funds, String remarks) { public GlobalResponse addChannelFundConfig(String bizChannel, String funds, String remarks) {
// 新增配置, 根据渠道查询如果库里已存在,返回异常; // 新增配置, 根据渠道查询如果库里已存在,返回异常;
...@@ -82,6 +83,8 @@ public class FundModuleChannelFundConfigServiceImpl implements IFundModuleChanne ...@@ -82,6 +83,8 @@ public class FundModuleChannelFundConfigServiceImpl implements IFundModuleChanne
fundModuleChannelFundConfig.setFunds(funds); fundModuleChannelFundConfig.setFunds(funds);
fundModuleChannelFundConfig.setRemarks(remarks); fundModuleChannelFundConfig.setRemarks(remarks);
fundModuleChannelFundConfig.setFundIds(ChannelFundConfigUtil.getAllFundIds(funds)); fundModuleChannelFundConfig.setFundIds(ChannelFundConfigUtil.getAllFundIds(funds));
// 默认测试
fundModuleChannelFundConfig.setType(0);
fundModuleChannelFundConfig.setEnable(true); fundModuleChannelFundConfig.setEnable(true);
fundModuleChannelFundConfigRepository.save(fundModuleChannelFundConfig); fundModuleChannelFundConfigRepository.save(fundModuleChannelFundConfig);
return GlobalResponse.create(FundModuleResponse.SUCCESS); return GlobalResponse.create(FundModuleResponse.SUCCESS);
......
...@@ -5,6 +5,7 @@ import java.util.HashMap; ...@@ -5,6 +5,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -98,9 +99,9 @@ public class FinanceProductHitLogServiceImpl implements IFinanceProductHitLogSer ...@@ -98,9 +99,9 @@ public class FinanceProductHitLogServiceImpl implements IFinanceProductHitLogSer
} }
String oldFundProductId = oldMap.get("fundProductId"); String oldFundProductId = oldMap.get("fundProductId");
String newFundProductId = newMap.get("fundProductId"); String newFundProductId = newMap.get("fundProductId");
if (oldFundProductId == null && newFundProductId == null) { if (StringUtils.isEmpty(oldFundProductId) && StringUtils.isEmpty(newFundProductId)) {
count++; count++;
} else if (oldFundProductId != null && newFundProductId != null) { } else if (StringUtils.isNotEmpty(oldFundProductId) && StringUtils.isNotEmpty(newFundProductId)) {
if (oldFundProductId.equals(newFundProductId)) { if (oldFundProductId.equals(newFundProductId)) {
count++; count++;
} }
......
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