Merge branch 'v1.2.0' into dev

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

@@ -15,8 +15,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 @Api(tags = "产品服务")
@@ -118,7 +116,7 @@ public interface ProductApi {
 
     @ApiOperation("推荐基金 - 私有基金")
     @GetMapping("/privatefund/query/samefund")
-    CommonResp<List<FundSameResp>> getRemmendPrivateFundList();
+    CommonResp<List<FundSameResp>> getRemmendPrivateFundList(@RequestParam("fundId") String fundId);
 
     @ApiOperation(value = "根据Id查询私有产品基本信息 - 私有基金")
     @PostMapping(value = "/privateFundInfo/simpleList", produces = {"application/json"})

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

@@ -17,8 +17,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 @RestController
@@ -153,8 +151,11 @@ public class ProductController implements ProductApi {
 
     @TanpuInterfaceLoginAuth
     @Override
-    public CommonResp<List<FundSameResp>> getRemmendPrivateFundList() {
-        return CommonResp.success(this.productService.getRemmendPrivateFundList());
+    public CommonResp<List<FundSameResp>> getRemmendPrivateFundList(String fundId) {
+        if (StringUtils.isEmpty(fundId)) {
+            return CommonResp.error(CommonResp.PARAMETER_INVALID_STATUS_CODE, CommonResp.PARAMETER_INVALID_MESSAGE);
+        }
+        return CommonResp.success(this.productService.getRemmendPrivateFundList(fundId));
     }
 
     @Override
@@ -191,6 +192,9 @@ public class ProductController implements ProductApi {
     @TanpuInterfaceLoginAuth
     @Override
     public CommonResp<List<FundSameResp>> querySamefund(String fundId) {
+        if (StringUtils.isEmpty(fundId)) {
+            return CommonResp.error(CommonResp.PARAMETER_INVALID_STATUS_CODE, CommonResp.PARAMETER_INVALID_MESSAGE);
+        }
         return CommonResp.success(this.productService.querySamefund(fundId));
     }
 }

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

@@ -67,5 +67,5 @@ public interface ProductService {
 
     List<FundSameResp> querySamefund(String fundId);
 
-    List<FundSameResp> getRemmendPrivateFundList();
+    List<FundSameResp> getRemmendPrivateFundList(String fundId);
 }

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

@@ -1545,7 +1545,7 @@ public class ProductServiceImpl implements ProductService, Constant {
 
         PageMethod.startPage(1, 10);
         FundCountExample example = new FundCountExample();
-        example.createCriteria().andSubstrategyEqualTo(fundInfo.getSubstrategy())
+        example.createCriteria().andSubstrategyEqualTo(fundInfo.getSubstrategy()).andIdNotEqualTo(fundId)
                 .andDataSourcesEqualTo(Constant.ONE_NUM).andDeleteTagEqualTo(BizEnums.DeleteTag.tag_init);
         example.setOrderByClause("ret_1y desc");
 
@@ -1571,9 +1571,11 @@ public class ProductServiceImpl implements ProductService, Constant {
     }
 
     @Override
-    public List<FundSameResp> getRemmendPrivateFundList() {
+    public List<FundSameResp> getRemmendPrivateFundList(String fundId) {
         IfaImportedFundInfoExample example = new IfaImportedFundInfoExample();
-        example.createCriteria().andIfaIdEqualTo(UserInfoThreadLocalHolder.getserInfo().getId()).andDeleteTagEqualTo(BizEnums.DeleteTag.tag_init);
+        example.createCriteria().andIfaIdEqualTo(UserInfoThreadLocalHolder.getserInfo().getId())
+                .andIdNotEqualTo(fundId)
+                .andDeleteTagEqualTo(BizEnums.DeleteTag.tag_init);
         List<IfaImportedFundInfo> importedFundInfoList = ifaImportedFundInfoMapper.selectByExample(example);
 
         List<String> fundIdList = importedFundInfoList.stream().map(IfaImportedFundInfo::getId).collect(Collectors.toList());