v1.0.18 #27

Merged
timi merged 6 commits from dev into master 2026-08-20 17:40:22 +00:00
2 changed files with 5 additions and 5 deletions
Showing only changes of commit 84190b9773 - Show all commits
@@ -204,10 +204,8 @@ public class GaoPointRuleServiceImplement extends AbstractEntityService<GaoPoint
JsonNode minNode = tier.get("min"); JsonNode minNode = tier.get("min");
TimiException.requiredTrue(minNode != null && minNode.isIntegralNumber() && 0 <= minNode.longValue(), "TIER.tiers[%d].min invalid".formatted(i)); TimiException.requiredTrue(minNode != null && minNode.isIntegralNumber() && 0 <= minNode.longValue(), "TIER.tiers[%d].min invalid".formatted(i));
long min = minNode.longValue(); long min = minNode.longValue();
if (i == 0) { if (0 < i) {
TimiException.requiredTrue(min == 0, "TIER 第一档 min 必须为 0"); TimiException.requiredTrue(previousMax != null && min == previousMax + 1, "TIER 分档必须连续且不能重叠");
} else {
TimiException.requiredTrue(previousMax != null && previousMax < Long.MAX_VALUE && min == previousMax + 1, "TIER 分档必须连续且不能重叠");
} }
JsonNode maxNode = tier.get("max"); JsonNode maxNode = tier.get("max");
@@ -173,7 +173,9 @@ public class GaoPointTriggerServiceImplement implements GaoPointTriggerService {
break; break;
} }
} }
TimiException.required(matchedTier, "TIER 没有匹配的分档"); if (matchedTier == null) {
return null;
}
long pointDelta = matchedTier.get("pointValue").longValue(); long pointDelta = matchedTier.get("pointValue").longValue();
ObjectNode payload = jackson.createObjectNode(); ObjectNode payload = jackson.createObjectNode();
payload.put("triggerType", GaoPointRule.TriggerType.CUSTOMER_EVENT_VALUE_TIER.name()); payload.put("triggerType", GaoPointRule.TriggerType.CUSTOMER_EVENT_VALUE_TIER.name());