Commit b3202932 authored by zp's avatar zp

aa

parent baa2d93d
...@@ -196,8 +196,10 @@ public class ProductServiceImpl implements ProductService, Constant { ...@@ -196,8 +196,10 @@ public class ProductServiceImpl implements ProductService, Constant {
if (fundCountMap.containsKey(info.getId())) { if (fundCountMap.containsKey(info.getId())) {
FundCount fundCount = fundCounts.get(0); FundCount fundCount = fundCounts.get(0);
vo.setRet1m(multiply100(fundCount.getRet1m())); vo.setRet1m(multiply100(fundCount.getRet1m()));
vo.setRetIncep(multiply100(fundCount.getRetIncep()));
} }
BeanUtils.copyProperties(info, vo); BeanUtils.copyProperties(info, vo);
vo.setOpenDay(info.getOpenDay());
vo.setProductName(info.getFundShortName()); vo.setProductName(info.getFundShortName());
vo.setDesc(info.getDescInfo()); vo.setDesc(info.getDescInfo());
vo.setFundId(info.getId()); vo.setFundId(info.getId());
...@@ -1414,9 +1416,11 @@ public class ProductServiceImpl implements ProductService, Constant { ...@@ -1414,9 +1416,11 @@ public class ProductServiceImpl implements ProductService, Constant {
} }
ProductInfoVO p = new ProductInfoVO(); ProductInfoVO p = new ProductInfoVO();
p.setOpenDay(item.getOpenDay());
p.setFundId(item.getId()); p.setFundId(item.getId());
p.setProductName(item.getFundName()); p.setProductName(item.getFundName());
p.setRet1m(importedFundCount == null ? null : BigDecimalUtil.toString(importedFundCount.getRet1m(), 2)); p.setRet1m(importedFundCount == null ? null : BigDecimalUtil.multiply100(importedFundCount.getRet1m()));
p.setRetIncep(importedFundCount == null ? null : BigDecimalUtil.multiply100(importedFundCount.getRetIncep()));
p.setNet(importedFundCount == null ? null : Net.builder().netDate(importedFundCount.getPriceDate().getTime()) p.setNet(importedFundCount == null ? null : Net.builder().netDate(importedFundCount.getPriceDate().getTime())
.netValue(BigDecimalUtil.toString(importedFundCount.getNetNav(), 4)) .netValue(BigDecimalUtil.toString(importedFundCount.getNetNav(), 4))
.build()); .build());
......
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