6.6-2 fix

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

@@ -304,24 +304,23 @@ public class FundModuleServiceImpl implements IFundModuleService{
 			}
 			QGPreconditions.checkArgument(fundArray.size() != 0, QGExceptionType.NO_FUND_INFO_BEEN_HIT);
 			// 看命中优先级是否符合要求
-			boolean[] bucket = new boolean[fundArray.size() + 1];
-			for (int i = 0, len = fundArray.size(); i < len; i++) {
-				int priority = fundArray.getJSONObject(i).getIntValue("priority");
-				if (!(priority > 0 && priority <= len)) {
-					result.setSuccess(false);
-					result.setMessage("多个资方配置存在交集");
-					configCondition.setResult(result);
-					continue B;
-				}
-				if (bucket[priority]) {
-					// 多个相同的优先级
-					result.setSuccess(false);
-					result.setMessage("多个资方配置存在交集");
-					configCondition.setResult(result);
-					continue B;
-				}
-				bucket[priority] = true;
-			}
+            if (fundArray.size() > 1){
+                Bag priBag = new HashBag(fundIds);
+                List<Integer> priList = new ArrayList<>();
+                for (int i = 0, len = fundArray.size(); i < len; i++) {
+                    Integer pri = fundArray.getJSONObject(i).getIntValue("priority");
+                    priList.add(pri);
+                    priBag.add(pri);
+                }
+                for (Integer pri : priList) {
+                    if (priBag.getCount(pri) > 1) {
+                        result.setSuccess(false);
+                        result.setMessage("多个资方配置存在交集");
+                        configCondition.setResult(result);
+                        continue B;
+                    }
+                }
+            }
 			// 查看是否两个资方ID相同且条件存在交集
 			Bag bag = new HashBag(fundIds);
 			boolean hasSameResultTotal = false;
@@ -427,7 +426,7 @@ public class FundModuleServiceImpl implements IFundModuleService{
 					}else {
 						String start = getValue(operator,list.get(0));
 						while (list.contains(start)){
-							start = getValue(operator,start);
+							start = getValue("<",start);
 						}
 						return start;
 					}