vip时间设置
This commit is contained in:
parent
4112160656
commit
6405052215
@ -257,7 +257,8 @@ public class ActivitySourceGroupGatewayImpl implements ActivitySourceGroupGatewa
|
||||
ActivityRewardProps activityRewardProps = propsActivityInfraConvertor
|
||||
.toActivityRewardProps(rewardConfig);
|
||||
activityRewardProps.setCover(resolveVipCover(vipConfig, vipCoverMap));
|
||||
activityRewardProps.setQuantity(durationDays(vipConfig));
|
||||
activityRewardProps.setQuantity(rewardQuantityOrDefault(rewardConfig.getQuantity(),
|
||||
durationDays(vipConfig)));
|
||||
activityRewardProps.setAmount(BigDecimal.valueOf(Objects.requireNonNullElse(
|
||||
vipConfig.getPriceGold(), 0L)));
|
||||
activityRewardProps.setRemark(displayName(vipConfig));
|
||||
@ -507,6 +508,10 @@ public class ActivitySourceGroupGatewayImpl implements ActivitySourceGroupGatewa
|
||||
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) {
|
||||
if (Objects.nonNull(vipConfig.getDisplayName()) && !vipConfig.getDisplayName().isBlank()) {
|
||||
return vipConfig.getDisplayName();
|
||||
|
||||
@ -287,7 +287,7 @@ public class PropsActivityRewardGroupClientServiceImpl implements
|
||||
config);
|
||||
propsActivity.setSort(Objects.isNull(propsActivity.getSort()) ? 0 : propsActivity.getSort());
|
||||
if (isVipLevelReward(config, vipConfigMap)) {
|
||||
setVipConfig(propsActivity, vipConfigMap.get(Long.valueOf(config.getContent())),
|
||||
setVipConfig(config, propsActivity, vipConfigMap.get(Long.valueOf(config.getContent())),
|
||||
vipCoverMap);
|
||||
return propsActivity;
|
||||
}
|
||||
@ -429,13 +429,15 @@ public class PropsActivityRewardGroupClientServiceImpl implements
|
||||
&& vipConfigMap.containsKey(DataTypeUtils.toLong(config.getContent()));
|
||||
}
|
||||
|
||||
private void setVipConfig(PropsActivityRewardConfigInfoDTO propsActivity,
|
||||
private void setVipConfig(PropsActivityRewardConfig config,
|
||||
PropsActivityRewardConfigInfoDTO propsActivity,
|
||||
VipLevelConfig vipConfig, Map<Long, PropsSourceRecord> vipCoverMap) {
|
||||
propsActivity.setCover(resolveVipCover(vipConfig, vipCoverMap));
|
||||
propsActivity.setSourceUrl(resolveVipSourceUrl(vipConfig, vipCoverMap));
|
||||
propsActivity.setAmount(BigDecimal.valueOf(Objects.requireNonNullElse(
|
||||
vipConfig.getPriceGold(), 0L)));
|
||||
propsActivity.setQuantity(durationDays(vipConfig));
|
||||
propsActivity.setQuantity(rewardQuantityOrDefault(config.getQuantity(),
|
||||
durationDays(vipConfig)));
|
||||
propsActivity.setName(displayName(vipConfig));
|
||||
propsActivity.setRemark(displayName(vipConfig));
|
||||
}
|
||||
@ -490,6 +492,10 @@ public class PropsActivityRewardGroupClientServiceImpl implements
|
||||
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) {
|
||||
if (StringUtils.isNotBlank(vipConfig.getDisplayName())) {
|
||||
return vipConfig.getDisplayName();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user