Merge branch 'master' into dev

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

@@ -30,7 +30,7 @@ public interface ProductOrderApi {
 
     @ApiOperation("查询基金分红信息")
     @GetMapping("/get/fund/bounsinfo")
-    CommonResp<List<FundBounsResp>> getFundBounsinfo(@ApiParam("基金代码") @RequestParam("list") List<String> list,
-                                                     @ApiParam("指定日期") @RequestParam("date") String date);
+    CommonResp<List<FundBounsResp>> getFundBounsinfo(@ApiParam("基金代码") @RequestParam(value = "list", required = false) List<String> list,
+                                                     @ApiParam("分红除息日") @RequestParam("date") String date);
 
 }

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

@@ -44,7 +44,7 @@ public class ProductOrderController implements ProductOrderApi {
     @Override
     public CommonResp<List<FundBounsResp>> getFundBounsinfo(List<String> list, String date) {
 
-        if (CollectionUtils.isEmpty(list) || StringUtils.isBlank(date)) {
+        if (StringUtils.isBlank(date)) {
             return CommonResp.error(CommonResp.PARAMETER_INVALID_STATUS_CODE, CommonResp.PARAMETER_INVALID_MESSAGE);
         }
 

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

@@ -132,13 +132,19 @@ public class ProductOrderServiceImpl implements ProductOrderService, Constant {
     @Override
     public List<FundBounsResp> getFundBounsinfo(List<String> list, String date) {
         LambdaQueryWrapper<TxFundDistribution> queryWrapper = new LambdaQueryWrapper<>();
+
+        queryWrapper.eq(TxFundDistribution::getExDate, date)
+                .eq(TxFundDistribution::getDeleteTag, BizEnums.DeleteTag.tag_init);
+
+        if (CollectionUtils.isNotEmpty(list)) {
+            queryWrapper.in(TxFundDistribution::getFundCode, list);
+        }
+
         final List<TxFundDistribution> distributionList = this.txFundDistributionMapper
-                .selectList(queryWrapper.ge(TxFundDistribution::getExDate, date)
-                        .in(TxFundDistribution::getFundCode, list)
-                        .eq(TxFundDistribution::getDeleteTag, BizEnums.DeleteTag.tag_init));
+                .selectList(queryWrapper);
 
         if (CollectionUtils.isNotEmpty(distributionList)) {
-            // 查询分红权益日内基金净值
+            // 查询分红除息日内基金净值
             TxFundNavExample fundNavExample = new TxFundNavExample();
             fundNavExample.createCriteria()
                     .andFundIdIn(distributionList.stream().map(c -> String.valueOf(c.getFundId())).collect(Collectors.toList()))
@@ -148,6 +154,9 @@ public class ProductOrderServiceImpl implements ProductOrderService, Constant {
                     .stream().collect(Collectors.groupingBy(TxFundNav::getFundId));
 
             return distributionList.stream().map(c -> {
+                if (!txFundNavMap.containsKey(String.valueOf(c.getFundId()))) {
+                    return null;
+                }
                 final FundBounsResp build = FundBounsResp.builder()
                         .fundId(c.getFundId())
                         .fundCode(c.getFundCode())
@@ -158,11 +167,14 @@ public class ProductOrderServiceImpl implements ProductOrderService, Constant {
 
                 final TxFundNav txFundNav = txFundNavMap.get(String.valueOf(c.getFundId())).stream()
                         .filter(nav -> StringUtils.equals(String.valueOf(c.getFundId()), nav.getFundId())
-                        && c.getExDate().getTime() == nav.getPriceDate().getTime()).findFirst().get();
+                        && c.getExDate().getTime() == nav.getPriceDate().getTime()).findFirst().orElse(null);
+                if (txFundNav == null) {
+                    return null;
+                }
                 build.setFundNet(txFundNav.getNav());
 
                 return build;
-            }).collect(Collectors.toList());
+            }).collect(Collectors.toList()).stream().filter(Objects::nonNull).collect(Collectors.toList());
         }
 
         return new ArrayList<>(0);