Skip to content

T
tamp_fund
Commit 538ddb68 authored by 张亚辉's avatar 张亚辉
Browse files
Options

Merge branch 'v1.2.0' into dev

parents c709df48 db1394cf
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/main/java/com/tanpu/fund/service/impl/ProductPrivateServiceImpl.java
View file @ 538ddb68
......@@ -307,7 +307,7 @@ public class ProductPrivateServiceImpl implements ProductPrivateService, Constan
infoVO.setFundId(fundId);
if (infoMap.get(fundId) != null) {
FundInfo fundInfo = infoMap.get(fundId);
infoVO.setFundName(fundInfo.getFundName());
infoVO.setFundName(fundInfo.getFundShortName());
infoVO.setRatioId(fundInfo.getPrimaryBenchmarkId());
if (fundInfo.getInceptionDate() != null) {
infoVO.setInceptionDate(fundInfo.getInceptionDate().getTime());
......
src/main/java/com/tanpu/fund/service/impl/ProductServiceImpl.java
View file @ 538ddb68
......@@ -676,7 +676,7 @@ public class ProductServiceImpl implements ProductService, Constant {
infoVO.setFundId(fundId);
if (infoMap.get(fundId) != null) {
FundInfo fundInfo = infoMap.get(fundId);
infoVO.setFundName(fundInfo.getFundName());
infoVO.setFundName(fundInfo.getFundShortName());
infoVO.setRatioId(fundInfo.getPrimaryBenchmarkId());
}
infoVO.setRetIncep(multiply100(l.getRetIncep()));
......
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