6.6-2

src/main/java/com/quantgroup/asset/distribution/service/funding/impl/FundModuleServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.stream.Collectors;
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.quantgroup.asset.distribution.enums.RuleOperator;
+import com.quantgroup.asset.distribution.enums.UnionType;
 import com.quantgroup.asset.distribution.exception.QGException;
 import com.quantgroup.asset.distribution.model.entity.fund.ChannelFundConfigNew;
 import com.quantgroup.asset.distribution.model.entity.fund.FundConfigCondition;
@@ -227,7 +228,7 @@ public class FundModuleServiceImpl implements IFundModuleService{
 		List<BaseRuleVO> baseRuleList = new ArrayList<>();
 		for (ChannelFundConfigNew channelFundConfig : fundConfigList) {
 			IRuleVO ruleVO = ruleService.getIRuleVo(channelFundConfig.getLimits());
-			baseRuleList.addAll(getAllBaseRule(ruleVO));
+			getAllBaseRule(baseRuleList,ruleVO);
 		}
 		Map<String,List<String>> keyValueMap = collectValueMap(baseRuleList);
 		//去掉相同的值 例如 amount>3000 和amount>=3000在生成案例时 3001都可以满足 此时会有两个3001
@@ -348,15 +349,18 @@ public class FundModuleServiceImpl implements IFundModuleService{
 		return GlobalResponse.success(vo);
 	}
 
-	private static List<BaseRuleVO> getAllBaseRule(IRuleVO ruleVO){
-		List<BaseRuleVO> baseRuleList = new ArrayList<>();
+	private static void getAllBaseRule(List<BaseRuleVO> ruleVOList,IRuleVO ruleVO){
 		if (ruleVO.getClass().isAssignableFrom(UnionRuleVO.class)){
 			UnionRuleVO uRuleVo = (UnionRuleVO)ruleVO;
-			baseRuleList= uRuleVo.getBaseRules();
+			ruleVOList.addAll(uRuleVo.getBaseRules());
+			if (CollectionUtils.isNotEmpty(uRuleVo.getUnionRules())){
+				for (UnionRuleVO vo : uRuleVo.getUnionRules()){
+					getAllBaseRule(ruleVOList,vo);
+				}
+			}
 		}else {
-			baseRuleList.add((BaseRuleVO)ruleVO);
+			ruleVOList.add((BaseRuleVO)ruleVO);
 		}
-		return baseRuleList;
 	}
 
 	private static List<String> createValue(String operator,String value){