vip时间设置

This commit is contained in:
hy001 2026-05-25 10:40:03 +08:00
parent 4112160656
commit 6405052215
2 changed files with 15 additions and 4 deletions

View File

@ -257,7 +257,8 @@ public class ActivitySourceGroupGatewayImpl implements ActivitySourceGroupGatewa
ActivityRewardProps activityRewardProps = propsActivityInfraConvertor ActivityRewardProps activityRewardProps = propsActivityInfraConvertor
.toActivityRewardProps(rewardConfig); .toActivityRewardProps(rewardConfig);
activityRewardProps.setCover(resolveVipCover(vipConfig, vipCoverMap)); activityRewardProps.setCover(resolveVipCover(vipConfig, vipCoverMap));
activityRewardProps.setQuantity(durationDays(vipConfig)); activityRewardProps.setQuantity(rewardQuantityOrDefault(rewardConfig.getQuantity(),
durationDays(vipConfig)));
activityRewardProps.setAmount(BigDecimal.valueOf(Objects.requireNonNullElse( activityRewardProps.setAmount(BigDecimal.valueOf(Objects.requireNonNullElse(
vipConfig.getPriceGold(), 0L))); vipConfig.getPriceGold(), 0L)));
activityRewardProps.setRemark(displayName(vipConfig)); activityRewardProps.setRemark(displayName(vipConfig));
@ -507,6 +508,10 @@ public class ActivitySourceGroupGatewayImpl implements ActivitySourceGroupGatewa
return Objects.nonNull(days) && days > 0 ? days : 30; return Objects.nonNull(days) && days > 0 ? days : 30;
} }
private int rewardQuantityOrDefault(Integer quantity, int defaultQuantity) {
return Objects.nonNull(quantity) && quantity > 0 ? quantity : defaultQuantity;
}
private String displayName(VipLevelConfig vipConfig) { private String displayName(VipLevelConfig vipConfig) {
if (Objects.nonNull(vipConfig.getDisplayName()) && !vipConfig.getDisplayName().isBlank()) { if (Objects.nonNull(vipConfig.getDisplayName()) && !vipConfig.getDisplayName().isBlank()) {
return vipConfig.getDisplayName(); return vipConfig.getDisplayName();

View File

@ -287,7 +287,7 @@ public class PropsActivityRewardGroupClientServiceImpl implements
config); config);
propsActivity.setSort(Objects.isNull(propsActivity.getSort()) ? 0 : propsActivity.getSort()); propsActivity.setSort(Objects.isNull(propsActivity.getSort()) ? 0 : propsActivity.getSort());
if (isVipLevelReward(config, vipConfigMap)) { if (isVipLevelReward(config, vipConfigMap)) {
setVipConfig(propsActivity, vipConfigMap.get(Long.valueOf(config.getContent())), setVipConfig(config, propsActivity, vipConfigMap.get(Long.valueOf(config.getContent())),
vipCoverMap); vipCoverMap);
return propsActivity; return propsActivity;
} }
@ -429,13 +429,15 @@ public class PropsActivityRewardGroupClientServiceImpl implements
&& vipConfigMap.containsKey(DataTypeUtils.toLong(config.getContent())); && vipConfigMap.containsKey(DataTypeUtils.toLong(config.getContent()));
} }
private void setVipConfig(PropsActivityRewardConfigInfoDTO propsActivity, private void setVipConfig(PropsActivityRewardConfig config,
PropsActivityRewardConfigInfoDTO propsActivity,
VipLevelConfig vipConfig, Map<Long, PropsSourceRecord> vipCoverMap) { VipLevelConfig vipConfig, Map<Long, PropsSourceRecord> vipCoverMap) {
propsActivity.setCover(resolveVipCover(vipConfig, vipCoverMap)); propsActivity.setCover(resolveVipCover(vipConfig, vipCoverMap));
propsActivity.setSourceUrl(resolveVipSourceUrl(vipConfig, vipCoverMap)); propsActivity.setSourceUrl(resolveVipSourceUrl(vipConfig, vipCoverMap));
propsActivity.setAmount(BigDecimal.valueOf(Objects.requireNonNullElse( propsActivity.setAmount(BigDecimal.valueOf(Objects.requireNonNullElse(
vipConfig.getPriceGold(), 0L))); vipConfig.getPriceGold(), 0L)));
propsActivity.setQuantity(durationDays(vipConfig)); propsActivity.setQuantity(rewardQuantityOrDefault(config.getQuantity(),
durationDays(vipConfig)));
propsActivity.setName(displayName(vipConfig)); propsActivity.setName(displayName(vipConfig));
propsActivity.setRemark(displayName(vipConfig)); propsActivity.setRemark(displayName(vipConfig));
} }
@ -490,6 +492,10 @@ public class PropsActivityRewardGroupClientServiceImpl implements
return Objects.nonNull(days) && days > 0 ? days : 30; return Objects.nonNull(days) && days > 0 ? days : 30;
} }
private int rewardQuantityOrDefault(Integer quantity, int defaultQuantity) {
return Objects.nonNull(quantity) && quantity > 0 ? quantity : defaultQuantity;
}
private String displayName(VipLevelConfig vipConfig) { private String displayName(VipLevelConfig vipConfig) {
if (StringUtils.isNotBlank(vipConfig.getDisplayName())) { if (StringUtils.isNotBlank(vipConfig.getDisplayName())) {
return vipConfig.getDisplayName(); return vipConfig.getDisplayName();