fix

src/main/java/com/quantgroup/asset/distribution/exception/QGExceptionType.java

@@ -41,6 +41,7 @@ public enum QGExceptionType {
     RULE_DATA_IS_EMPTY(2032, "规则数据为空,key:%s, operator:%s, value:%s"),
     DATA_COMPARE_ERROR(2033, "数据比较出现错误"),
     RULE_OPERATOR_NOT_EXIST(2034, "规则符不存在"),
+    CRATE_RULE_VO_ERROR(2035, "规则格式无法形成规则对象"),
 
 	
 	NOTIFY_FUND_SERVER_ERROR(2041, "通知资金系统失败, uuid : %s, bizNo : %s, assetNo : %s"),

src/main/java/com/quantgroup/asset/distribution/service/asset/impl/AssetServiceImpl.java

@@ -244,11 +244,7 @@ public class AssetServiceImpl implements IAssetService{
 		List<ChannelFundConfigNew> fundConfigList = JSONArray.parseArray(config.getFunds(), ChannelFundConfigNew.class);
 		A : for (ChannelFundConfigNew channelFundConfig : fundConfigList) {
 				IRuleVO ruleVO = ruleService.getIRuleVo(channelFundConfig.getLimits());
-				if (ruleVO != null) {
-					if (!ruleVO.valid(data)) {
-						continue A;
-					}
-				}
+				if (ruleVO == null) { throw new QGException(QGExceptionType.CRATE_RULE_VO_ERROR); }
 				// 如果参数为空，直接不满足
 				Set<String> params = ruleVO.getParamNames();
 				for (String key : params) {
@@ -256,6 +252,9 @@ public class AssetServiceImpl implements IAssetService{
 						continue A;
 					}
 				}
+				if (!ruleVO.valid(data)) {
+					continue A;
+				}
 				// 是否配了审核条件
 				boolean hasAuditResultLimit = params.contains("audit_result");
 				if (!hasAuditResultLimit) {