|
@@ -68,6 +68,9 @@ public class CommonRule {
|
|
|
@Autowired
|
|
|
MsgNewUtil msgNewUtil;
|
|
|
|
|
|
+ // 重复开立的时间间隔( xxL表示xx小时)
|
|
|
+ public static final Long REPEAT_DATA = 12L * 60;
|
|
|
+
|
|
|
/**
|
|
|
* 比较阳性属性是否匹配
|
|
|
*
|
|
@@ -519,7 +522,7 @@ public class CommonRule {
|
|
|
T itNext = items.get(j);
|
|
|
String nextDateValue = ReflectUtil.getProperty(itNext, "dateValue");
|
|
|
if (StringUtil.isNotBlank(nextDateValue)) {
|
|
|
- int dateFlag = CoreUtil.compareTime(curDateValue, nextDateValue, 60L * 24, false, true);
|
|
|
+ int dateFlag = CoreUtil.compareTime(curDateValue, nextDateValue, REPEAT_DATA, false, true);
|
|
|
if (dateFlag == 1
|
|
|
&& getFrquenceType(ReflectUtil.getProperty(it, "frequency"))
|
|
|
.equals(getFrquenceType(ReflectUtil.getProperty(itNext, "frequency")))) {
|
|
@@ -571,7 +574,7 @@ public class CommonRule {
|
|
|
if (StringUtil.isBlank(finishDateValue)) {
|
|
|
String curDateValue = ReflectUtil.getProperty(order, "dateValue"); // 当前开单时间
|
|
|
String pastDateValue = ReflectUtil.getProperty(it, "dateValue"); // 历史开单时间
|
|
|
- int dateFlag = CoreUtil.compareTime(pastDateValue, curDateValue, 60L * 24, false, false);
|
|
|
+ int dateFlag = CoreUtil.compareTime(pastDateValue, curDateValue, REPEAT_DATA, false, false);
|
|
|
// 规定时间内,并且频次相同
|
|
|
if (dateFlag == 1 &&
|
|
|
getFrquenceType(ReflectUtil.getProperty(it, "frequency"))
|