Commit 7febcd23 authored by 张亚辉's avatar 张亚辉

Merge branch 'v1.2.0' of 47.100.44.39:zhoupeng/tamp_fund into v1.2.0

parents a6ca7fc3 3d296757
...@@ -252,6 +252,8 @@ public class ProductServiceImpl implements ProductService, Constant { ...@@ -252,6 +252,8 @@ public class ProductServiceImpl implements ProductService, Constant {
vo.setFundId(info.getId()); vo.setFundId(info.getId());
// 最新净值 // 最新净值
vo.setNet(getNewNet(info.getId())); vo.setNet(getNewNet(info.getId()));
vo.setStrategy(info.getStrategy() + "");
vo.setSubstrategy(info.getSubstrategy() + "");
vo.setProductType(Constant.ONE_NUM); vo.setProductType(Constant.ONE_NUM);
vos.add(vo); vos.add(vo);
}); });
...@@ -1516,6 +1518,8 @@ public class ProductServiceImpl implements ProductService, Constant { ...@@ -1516,6 +1518,8 @@ public class ProductServiceImpl implements ProductService, Constant {
ProductInfoVO p = new ProductInfoVO(); ProductInfoVO p = new ProductInfoVO();
p.setOpenDay(item.getOpenDay()); p.setOpenDay(item.getOpenDay());
p.setFundId(item.getId()); p.setFundId(item.getId());
p.setSubstrategy(item.getSubstrategy() + "");
p.setStrategy(item.getStrategy() + "");
p.setProductName(item.getFundName()); p.setProductName(item.getFundName());
p.setRet1m(importedFundCount == null ? null : BigDecimalUtil.multiply100(importedFundCount.getRet1m())); p.setRet1m(importedFundCount == null ? null : BigDecimalUtil.multiply100(importedFundCount.getRet1m()));
p.setRetIncep(importedFundCount == null ? null : BigDecimalUtil.multiply100(importedFundCount.getRetIncep())); p.setRetIncep(importedFundCount == null ? null : BigDecimalUtil.multiply100(importedFundCount.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