Merge remote-tracking branch 'origin/bugfix-20210811'

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

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
@@ -134,10 +135,16 @@ public interface ProductApi {
     @GetMapping("/privatefund/query/samefund")
     CommonResp<List<FundSameResp>> getRemmendPrivateFundList(@RequestParam("fundId") String fundId);
 
+    @ApiIgnore
     @ApiOperation(value = "根据Id查询私有产品基本信息 - 私有基金")
     @PostMapping(value = "/privateFundInfo/simpleList", produces = {"application/json"})
     CommonResp<List<FundInfoSimpleListResp>> privateSimpleList(@RequestBody List<String> idList);
 
+    @ApiIgnore
+    @ApiOperation(value = "根据Id查询无净值产品基本信息")
+    @PostMapping(value = "/noNavFund/simpleList", produces = {"application/json"})
+    CommonResp<List<FundInfoSimpleListResp>> noNavFundSimpleList(@RequestBody List<String> idList);
+
     @ApiOperation("基金公司 - 私有基金")
     @GetMapping("/private/fund/company")
     CommonResp<FundCompanyVO> getPrivateFundCompanyInfo(@ApiParam("基金公司id") @RequestParam("id") String id,

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

@@ -185,6 +185,11 @@ public class ProductController implements ProductApi {
         return CommonResp.success(productService.getPrivateSimpleList(idList));
     }
 
+    @Override
+    public CommonResp<List<FundInfoSimpleListResp>> noNavFundSimpleList(List<String> idList) {
+        return CommonResp.success(productService.getNoNavFundSimpleList(idList));
+    }
+
     @Override
     public CommonResp<FundCompanyVO> getPrivateFundCompanyInfo(String id, String ifaId, Pageable page) {
         return CommonResp.success(this.productPrivateService.getFundCompany(id, ifaId, page));

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

@@ -94,4 +94,6 @@ public interface ProductService {
     List<FundSameResp> getNoNetfund(String fundId);
 
     List<ProductInfoVO> querybyids(List<String> ids);
+
+    List<FundInfoSimpleListResp> getNoNavFundSimpleList(List<String> idList);
 }

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

@@ -2470,4 +2470,20 @@ public class ProductServiceImpl implements ProductService, Constant {
             return p;
         }).collect(Collectors.toList());
     }
+
+    @Override
+    public List<FundInfoSimpleListResp> getNoNavFundSimpleList(List<String> idList) {
+        if (CollectionUtils.isEmpty(idList)) {
+            return Lists.newArrayListWithCapacity(0);
+        }
+        IfaImportedNonavFundExample example = new IfaImportedNonavFundExample();
+        example.createCriteria().andIdIn(idList);
+        List<IfaImportedNonavFund> ifaImportedNonavFundList = ifaImportedNonavFundMapper.selectByExample(example);
+        return ifaImportedNonavFundList.stream().map(fundInfo -> FundInfoSimpleListResp.builder()
+                .id(fundInfo.getId())
+                .fundName(fundInfo.getFundName())
+                .fundShortName(fundInfo.getFundName())
+                .build())
+                .collect(Collectors.toList());
+    }
 }