Merge branch 'v1.3.3' into dev

src/main/java/com/tanpu/fund/api/ProductApi.java

@@ -198,4 +198,8 @@ public interface ProductApi {
     @GetMapping("/noNetfund/query/samefund")
     CommonResp<List<FundSameResp>> getNoNetfund(@RequestParam("fundId") String fundId);
 
+    @ApiOperation("无净值基金-根据ID查询列表")
+    @GetMapping("/noNetfund/querybyids")
+    CommonResp<List<ProductInfoVO>> querybyids(@RequestParam("list") List<String> ids);
+
 }

src/main/java/com/tanpu/fund/controller/ProductController.java

 package com.tanpu.fund.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.tanpu.common.auth.mapping.TanpuInterfaceLoginAuth;
 import com.tanpu.common.model.Page;
 import com.tanpu.common.model.Pageable;
@@ -252,4 +253,12 @@ public class ProductController implements ProductApi {
         }
         return CommonResp.success(this.productService.getNoNetfund(fundId));
     }
+
+    @Override
+    public CommonResp<List<ProductInfoVO>> querybyids(List<String> ids) {
+        if (CollectionUtil.isEmpty(ids)) {
+            return CommonResp.error(CommonResp.PARAMETER_INVALID_STATUS_CODE, CommonResp.PARAMETER_INVALID_MESSAGE);
+        }
+        return CommonResp.success(this.productService.querybyids(ids));
+    }
 }

src/main/java/com/tanpu/fund/service/ProductService.java

@@ -92,4 +92,6 @@ public interface ProductService {
     List<Type> getFundLikeShortName(String productName, Pageable page);
 
     List<FundSameResp> getNoNetfund(String fundId);
+
+    List<ProductInfoVO> querybyids(List<String> ids);
 }

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

@@ -2450,4 +2450,23 @@ public class ProductServiceImpl implements ProductService, Constant {
 
         return new ArrayList<>(0);
     }
+
+    @Override
+    public List<ProductInfoVO> querybyids(List<String> ids) {
+        IfaImportedNonavFundExample example = new IfaImportedNonavFundExample();
+        example.createCriteria().andIdIn(ids).andDeleteTagEqualTo(BizEnums.DeleteTag.tag_init);
+        List<IfaImportedNonavFund> ifaImportedNonavFundList = ifaImportedNonavFundMapper.selectByExample(example);
+        if (CollectionUtils.isNotEmpty(ifaImportedNonavFundList)) {
+            return new ArrayList<>(0);
+        }
+
+        return ifaImportedNonavFundList.stream().map(item -> {
+            ProductInfoVO p = new ProductInfoVO();
+            p.setProductName(item.getFundName());
+            p.setFundName(item.getFundName());
+            p.setFundId(item.getId());
+            p.setDesc(item.getSummary());
+            return p;
+        }).collect(Collectors.toList());
+    }
 }