Merge remote-tracking branch 'origin/v1.2.0'

src/main/java/com/tanpu/fund/service/impl/ProductPrivateServiceImpl.java

@@ -172,6 +172,8 @@ public class ProductPrivateServiceImpl implements ProductPrivateService, Constan
         List<String> fundIds = managerMappings.stream().map(FundManagerMapping::getFundId).distinct()
                 .collect(Collectors.toList());
 
+        fundIds.add(id);
+
         FundCountExample example2 = new FundCountExample();
         example2.createCriteria()
                 .andFundIdIn(fundIds)
@@ -236,14 +238,15 @@ public class ProductPrivateServiceImpl implements ProductPrivateService, Constan
                     vo.setInceptionDate(LongUtil.timeLong(fundInfo.getInceptionDate()));
                 }
                 // 设置代表基金id 其他基金信息
-                getDelegateById(i.getId(), map, infoMap, fundCountMap, vo);
+                getDelegateById(i.getId(), map, infoMap, fundCountMap, vo, isCheckSet);
             }
             return vo;
         }).collect(Collectors.toList());
     }
 
     private void getDelegateById(String personalId, Map<String, List<FundManagerMapping>> map,
-                                 Map<String, FundInfo> infoMap, Map<String, FundCount> fundCountMap, FundManagerVO vo) {
+                                 Map<String, FundInfo> infoMap, Map<String, FundCount> fundCountMap,
+                                 FundManagerVO vo, Set<String> isCheckSet) {
         if (CollectionUtils.isNotEmpty(map.get(personalId))) {
             List<FundManagerMapping> mappings = map.get(personalId);
 
@@ -266,6 +269,7 @@ public class ProductPrivateServiceImpl implements ProductPrivateService, Constan
             vo.setFundInfoVOS(list.stream().map(l -> {
                 FundInfoVO infoVO = new FundInfoVO();
                 String fundId = l.getFundId();
+                infoVO.setIsCheck(isCheckSet.contains(fundId) ? 1 : 0);
                 infoVO.setFundId(fundId);
                 if (infoMap.get(fundId) != null) {
                     FundInfo fundInfo = infoMap.get(fundId);
@@ -309,6 +313,7 @@ public class ProductPrivateServiceImpl implements ProductPrivateService, Constan
         FundCompanyVO vo = new FundCompanyVO();
         vo.setCompanyName(companyInfo.getCompanyName());
         vo.setCompanyId(companyInfo.getId());
+        vo.setCompanyProfile(companyInfo.getCompanyProfile());
         vo.setImg(filePrefix + companyInfo.getLogo());
 
         if (CollectionUtils.isNotEmpty(companyTnaPersonnels)) {

src/main/java/com/tanpu/fund/service/impl/ProductServiceImpl.java

@@ -333,6 +333,7 @@ public class ProductServiceImpl implements ProductService, Constant {
         FundCompanyVO vo = new FundCompanyVO();
         vo.setCompanyName(companyInfo.getCompanyName());
         vo.setCompanyId(companyInfo.getId());
+        vo.setCompanyProfile(companyInfo.getCompanyProfile());
         vo.setImg(filePrefix + companyInfo.getLogo());
 
         /*if (CollectionUtils.isNotEmpty(companyTnaPersonnels)) {