hy/yumi-java
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: hy:1520362d9f33bd9cd1800d0952d509c98a87cb4e
Branches Tags
hy:main
hy:test
hy:release/redis-memory-fix-20260521
hy:feature-trtc
..
compare: hy:74fd42330eb87b688ab3b0cdf20761b5bb0890a1
Branches Tags
hy:main
hy:test
hy:release/redis-memory-fix-20260521
hy:feature-trtc

No commits in common. "1520362d9f33bd9cd1800d0952d509c98a87cb4e" and "74fd42330eb87b688ab3b0cdf20761b5bb0890a1" have entirely different histories.
1520362d9f ... 74fd42330e

2 changed files with 4 additions and 15 deletions
Show Stats Expand all files Collapse all files

7
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/gateway/props/ActivitySourceGroupGatewayImpl.java
View File

@ -257,8 +257,7 @@ 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(rewardQuantityOrDefault(rewardConfig.getQuantity(), activityRewardProps.setQuantity(durationDays(vipConfig));
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));
@ -508,10 +507,6 @@ 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();

12
rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/material/props/impl/PropsActivityRewardGroupClientServiceImpl.java
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(config, propsActivity, vipConfigMap.get(Long.valueOf(config.getContent())), setVipConfig(propsActivity, vipConfigMap.get(Long.valueOf(config.getContent())),
vipCoverMap); vipCoverMap);
return propsActivity; return propsActivity;
} }
@ -429,15 +429,13 @@ public class PropsActivityRewardGroupClientServiceImpl implements
&& vipConfigMap.containsKey(DataTypeUtils.toLong(config.getContent())); && vipConfigMap.containsKey(DataTypeUtils.toLong(config.getContent()));
} }
private void setVipConfig(PropsActivityRewardConfig config, private void setVipConfig(PropsActivityRewardConfigInfoDTO propsActivity,
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(rewardQuantityOrDefault(config.getQuantity(), propsActivity.setQuantity(durationDays(vipConfig));
durationDays(vipConfig)));
propsActivity.setName(displayName(vipConfig)); propsActivity.setName(displayName(vipConfig));
propsActivity.setRemark(displayName(vipConfig)); propsActivity.setRemark(displayName(vipConfig));
} }
@ -492,10 +490,6 @@ 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();