|
@@ -32,6 +32,7 @@ import java.math.BigDecimal;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
+import java.util.Objects;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -61,9 +62,9 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
|
|
|
@Override
|
|
|
public IPage<GameBackPolicyVO> policyList(GameBackPolicyListDTO dto) {
|
|
|
return gameBackPolicyService.page(dto.toPage(), new LambdaQueryWrapper<GameBackPolicy>()
|
|
|
- .like(StringUtils.isNotBlank(dto.getBackPolicyName()), GameBackPolicy::getBackPolicyName, dto.getBackPolicyName())
|
|
|
- .eq(GameBackPolicy::getCreateBy, SecurityUtil.getUserId())
|
|
|
- .orderByDesc(GameBackPolicy::getCreateTime))
|
|
|
+ .like(StringUtils.isNotBlank(dto.getBackPolicyName()), GameBackPolicy::getBackPolicyName, dto.getBackPolicyName())
|
|
|
+ .eq(GameBackPolicy::getCreateBy, SecurityUtil.getUserId())
|
|
|
+ .orderByDesc(GameBackPolicy::getCreateTime))
|
|
|
.convert(this::toVO);
|
|
|
}
|
|
|
|
|
@@ -82,47 +83,54 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
|
|
|
}
|
|
|
GameBackPolicy backPolicy = GameBackPolicy.builder()
|
|
|
.backPolicyName(dto.getBackPolicyName())
|
|
|
- .firstMinMoney(NumberUtil.multiply100(dto.getFirstMinMoney()).longValue())
|
|
|
- .firstMinMoneyType(dto.getFirstMinMoneyType())
|
|
|
- .firstMinMoneyRate(dto.getFirstMinMoneyRate())
|
|
|
- .firstMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
|
|
|
- .firstMaxMoneyType(dto.getFirstMaxMoneyType())
|
|
|
- .firstMaxMoneyRate(dto.getFirstMaxMoneyRate())
|
|
|
- .firstOtherMoneyType(dto.getFirstOtherMoneyType())
|
|
|
- .firstOtherMoneyRate(dto.getFirstOtherMoneyRate())
|
|
|
- .firstDownLevel(downLevelToString(dto.getFirstDownLevel()))
|
|
|
- .firstBackCountOfUser(dto.getFirstBackCountOfUser())
|
|
|
- .rechargeMinMoney(NumberUtil.multiply100(dto.getRechargeMinMoney()).longValue())
|
|
|
- .rechargeMinMoneyType(dto.getRechargeMinMoneyType())
|
|
|
- .rechargeMinMoneyRate(dto.getRechargeMinMoneyRate())
|
|
|
- .rechargeMaxMoney(NumberUtil.multiply100(dto.getRechargeMaxMoney()).longValue())
|
|
|
- .rechargeMaxMoneyType(dto.getRechargeMaxMoneyType())
|
|
|
- .rechargeMaxMoneyRate(dto.getRechargeMaxMoneyRate())
|
|
|
- .rechargeOtherMoneyType(dto.getRechargeOtherMoneyType())
|
|
|
- .rechargeOtherMoneyRate(dto.getRechargeOtherMoneyRate())
|
|
|
- .rechargeDownLevel(downLevelToString(dto.getRechargeDownLevel()))
|
|
|
- .rechargeBackCountOfUser(dto.getRechargeBackCountOfUser())
|
|
|
+ .policyType(dto.getPolicyType())
|
|
|
.createBy(SecurityUtil.getUserId())
|
|
|
.createTime(LocalDateTime.now())
|
|
|
- .regPayIntervalTime(dto.getRegPayIntervalTime())
|
|
|
- .backUnit(dto.getBackUnit())
|
|
|
- .markUpOrder(dto.getMarkUpOrder())
|
|
|
- .markUpOrderMinMoney(dto.getMarkUpOrderMinMoney() == null ? null : NumberUtil.multiply100(dto.getMarkUpOrderMinMoney()).longValue())
|
|
|
- .markUpOrderMinMoneyType(dto.getMarkUpOrderMinMoneyType())
|
|
|
- .markUpOrderMinMoneyRate(dto.getMarkUpOrderMinMoneyRate())
|
|
|
- .markUpOrderMaxMoney(dto.getMarkUpOrderMaxMoney() == null ? null : NumberUtil.multiply100(dto.getMarkUpOrderMaxMoney()).longValue())
|
|
|
- .markUpOrderMaxMoneyType(dto.getMarkUpOrderMaxMoneyType())
|
|
|
- .markUpOrderMaxMoneyRate(dto.getMarkUpOrderMaxMoneyRate())
|
|
|
- .markUpOrderOtherMoneyType(dto.getMarkUpOrderOtherMoneyType())
|
|
|
- .markUpOrderOtherMoneyRate(dto.getMarkUpOrderOtherMoneyRate())
|
|
|
- .markUpDownLevel(downLevelToString(dto.getMarkUpDownLevel()))
|
|
|
- .markUpBackCountOfUser(dto.getMarkUpBackCountOfUser())
|
|
|
- .largeAmount(dto.getLargeAmount() == null ? null : NumberUtil.multiply100(dto.getLargeAmount()).longValue())
|
|
|
- .supperSmallAmount(dto.getSupperSmallAmount() == null ? null : NumberUtil.multiply100(dto.getSupperSmallAmount()).longValue())
|
|
|
- .splitStrategy(CollectionUtils.isEmpty(dto.getSplitStrategy()) ? null : JsonUtil.toString(dto.getSplitStrategy()))
|
|
|
- .activeBackSwitch(dto.getActiveBackSwitch())
|
|
|
- .roleLevelMin(dto.getRoleLevelMin())
|
|
|
.build();
|
|
|
+ if (Objects.equals(dto.getPolicyType(), GameBackPolicy.TYPE_DEFAULT)) {
|
|
|
+ backPolicy.setFirstMinMoney(NumberUtil.multiply100(dto.getFirstMinMoney()).longValue());
|
|
|
+ backPolicy.setFirstMinMoneyType(dto.getFirstMinMoneyType());
|
|
|
+ backPolicy.setFirstMinMoneyRate(dto.getFirstMinMoneyRate());
|
|
|
+ backPolicy.setFirstMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue());
|
|
|
+ backPolicy.setFirstMaxMoneyType(dto.getFirstMaxMoneyType());
|
|
|
+ backPolicy.setFirstMaxMoneyRate(dto.getFirstMaxMoneyRate());
|
|
|
+ backPolicy.setFirstOtherMoneyType(dto.getFirstOtherMoneyType());
|
|
|
+ backPolicy.setFirstOtherMoneyRate(dto.getFirstOtherMoneyRate());
|
|
|
+ backPolicy.setFirstDownLevel(downLevelToString(dto.getFirstDownLevel()));
|
|
|
+ backPolicy.setFirstBackCountOfUser(dto.getFirstBackCountOfUser());
|
|
|
+ backPolicy.setRechargeMinMoney(NumberUtil.multiply100(dto.getRechargeMinMoney()).longValue());
|
|
|
+ backPolicy.setRechargeMinMoneyType(dto.getRechargeMinMoneyType());
|
|
|
+ backPolicy.setRechargeMinMoneyRate(dto.getRechargeMinMoneyRate());
|
|
|
+ backPolicy.setRechargeMaxMoney(NumberUtil.multiply100(dto.getRechargeMaxMoney()).longValue());
|
|
|
+ backPolicy.setRechargeMaxMoneyType(dto.getRechargeMaxMoneyType());
|
|
|
+ backPolicy.setRechargeMaxMoneyRate(dto.getRechargeMaxMoneyRate());
|
|
|
+ backPolicy.setRechargeOtherMoneyType(dto.getRechargeOtherMoneyType());
|
|
|
+ backPolicy.setRechargeOtherMoneyRate(dto.getRechargeOtherMoneyRate());
|
|
|
+ backPolicy.setRechargeDownLevel(downLevelToString(dto.getRechargeDownLevel()));
|
|
|
+ backPolicy.setRechargeBackCountOfUser(dto.getRechargeBackCountOfUser());
|
|
|
+ backPolicy.setRegPayIntervalTime(dto.getRegPayIntervalTime());
|
|
|
+ backPolicy.setBackUnit(dto.getBackUnit());
|
|
|
+ backPolicy.setMarkUpOrder(dto.getMarkUpOrder());
|
|
|
+ backPolicy.setMarkUpOrderMinMoney(dto.getMarkUpOrderMinMoney() == null ? null : NumberUtil.multiply100(dto.getMarkUpOrderMinMoney()).longValue());
|
|
|
+ backPolicy.setMarkUpOrderMinMoneyType(dto.getMarkUpOrderMinMoneyType());
|
|
|
+ backPolicy.setMarkUpOrderMinMoneyRate(dto.getMarkUpOrderMinMoneyRate());
|
|
|
+ backPolicy.setMarkUpOrderMaxMoney(dto.getMarkUpOrderMaxMoney() == null ? null : NumberUtil.multiply100(dto.getMarkUpOrderMaxMoney()).longValue());
|
|
|
+ backPolicy.setMarkUpOrderMaxMoneyType(dto.getMarkUpOrderMaxMoneyType());
|
|
|
+ backPolicy.setMarkUpOrderMaxMoneyRate(dto.getMarkUpOrderMaxMoneyRate());
|
|
|
+ backPolicy.setMarkUpOrderOtherMoneyType(dto.getMarkUpOrderOtherMoneyType());
|
|
|
+ backPolicy.setMarkUpOrderOtherMoneyRate(dto.getMarkUpOrderOtherMoneyRate());
|
|
|
+ backPolicy.setMarkUpDownLevel(downLevelToString(dto.getMarkUpDownLevel()));
|
|
|
+ backPolicy.setMarkUpBackCountOfUser(dto.getMarkUpBackCountOfUser());
|
|
|
+ backPolicy.setLargeAmount(dto.getLargeAmount() == null ? null : NumberUtil.multiply100(dto.getLargeAmount()).longValue());
|
|
|
+ backPolicy.setSupperSmallAmount(dto.getSupperSmallAmount() == null ? null : NumberUtil.multiply100(dto.getSupperSmallAmount()).longValue());
|
|
|
+ backPolicy.setSplitStrategy(CollectionUtils.isEmpty(dto.getSplitStrategy()) ? null : JsonUtil.toString(dto.getSplitStrategy()));
|
|
|
+ backPolicy.setActiveBackSwitch(dto.getActiveBackSwitch());
|
|
|
+ backPolicy.setRoleLevelMin(dto.getRoleLevelMin());
|
|
|
+ } else if (Objects.equals(dto.getPolicyType(), GameBackPolicy.TYPE_SUM_RECHARGE)) {
|
|
|
+ backPolicy.setTypeOfSumRechargeJson(JsonUtil.toString(dto.getTypeOfSumRecharge()));
|
|
|
+ } else if (Objects.equals(dto.getPolicyType(), GameBackPolicy.TYPE_SPLIT_LEVEL)) {
|
|
|
+ backPolicy.setTypeOfSplitLevelJson(JsonUtil.toString(dto.getTypeOfSplitLevel()));
|
|
|
+ }
|
|
|
return gameBackPolicyService.save(backPolicy);
|
|
|
}
|
|
|
|
|
@@ -135,49 +143,55 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
|
|
|
GameBackPolicy backPolicy = GameBackPolicy.builder()
|
|
|
.id(policyId)
|
|
|
.backPolicyName(dto.getBackPolicyName())
|
|
|
- .firstMinMoney(NumberUtil.multiply100(dto.getFirstMinMoney()).longValue())
|
|
|
- .firstMinMoneyType(dto.getFirstMinMoneyType())
|
|
|
- .firstMinMoneyRate(dto.getFirstMinMoneyRate())
|
|
|
- .firstMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
|
|
|
- .firstMaxMoneyType(dto.getFirstMaxMoneyType())
|
|
|
- .firstMaxMoneyRate(dto.getFirstMaxMoneyRate())
|
|
|
- .firstOtherMoneyType(dto.getFirstOtherMoneyType())
|
|
|
- .firstOtherMoneyRate(dto.getFirstOtherMoneyRate())
|
|
|
- .firstDownLevel(downLevelToString(dto.getFirstDownLevel()))
|
|
|
- .firstBackCountOfUser(dto.getFirstBackCountOfUser())
|
|
|
- .rechargeMinMoney(NumberUtil.multiply100(dto.getRechargeMinMoney()).longValue())
|
|
|
- .rechargeMinMoneyType(dto.getRechargeMinMoneyType())
|
|
|
- .rechargeMinMoneyRate(dto.getRechargeMinMoneyRate())
|
|
|
- .rechargeMaxMoney(NumberUtil.multiply100(dto.getRechargeMaxMoney()).longValue())
|
|
|
- .rechargeMaxMoneyType(dto.getRechargeMaxMoneyType())
|
|
|
- .rechargeMaxMoneyRate(dto.getRechargeMaxMoneyRate())
|
|
|
- .rechargeOtherMoneyType(dto.getRechargeOtherMoneyType())
|
|
|
- .rechargeOtherMoneyRate(dto.getRechargeOtherMoneyRate())
|
|
|
- .rechargeDownLevel(downLevelToString(dto.getRechargeDownLevel()))
|
|
|
- .rechargeBackCountOfUser(dto.getRechargeBackCountOfUser())
|
|
|
- .regPayIntervalTime(dto.getRegPayIntervalTime())
|
|
|
.createBy(old.getCreateBy())
|
|
|
.createTime(old.getCreateTime())
|
|
|
.updateBy(SecurityUtil.getUserId())
|
|
|
.updateTime(LocalDateTime.now())
|
|
|
- .backUnit(dto.getBackUnit())
|
|
|
- .markUpOrder(dto.getMarkUpOrder())
|
|
|
- .markUpOrderMinMoney(dto.getMarkUpOrderMinMoney() == null ? null : NumberUtil.multiply100(dto.getMarkUpOrderMinMoney()).longValue())
|
|
|
- .markUpOrderMinMoneyType(dto.getMarkUpOrderMinMoneyType())
|
|
|
- .markUpOrderMinMoneyRate(dto.getMarkUpOrderMinMoneyRate())
|
|
|
- .markUpOrderMaxMoney(dto.getMarkUpOrderMaxMoney() == null ? null : NumberUtil.multiply100(dto.getMarkUpOrderMaxMoney()).longValue())
|
|
|
- .markUpOrderMaxMoneyType(dto.getMarkUpOrderMaxMoneyType())
|
|
|
- .markUpOrderMaxMoneyRate(dto.getMarkUpOrderMaxMoneyRate())
|
|
|
- .markUpOrderOtherMoneyType(dto.getMarkUpOrderOtherMoneyType())
|
|
|
- .markUpOrderOtherMoneyRate(dto.getMarkUpOrderOtherMoneyRate())
|
|
|
- .markUpDownLevel(downLevelToString(dto.getMarkUpDownLevel()))
|
|
|
- .markUpBackCountOfUser(dto.getMarkUpBackCountOfUser())
|
|
|
- .largeAmount(dto.getLargeAmount() == null ? null : NumberUtil.multiply100(dto.getLargeAmount()).longValue())
|
|
|
- .supperSmallAmount(dto.getSupperSmallAmount() == null ? null : NumberUtil.multiply100(dto.getSupperSmallAmount()).longValue())
|
|
|
- .splitStrategy(CollectionUtils.isEmpty(dto.getSplitStrategy()) ? null : JsonUtil.toString(dto.getSplitStrategy()))
|
|
|
- .activeBackSwitch(dto.getActiveBackSwitch())
|
|
|
- .roleLevelMin(dto.getRoleLevelMin())
|
|
|
.build();
|
|
|
+ if (Objects.equals(dto.getPolicyType(), GameBackPolicy.TYPE_DEFAULT)) {
|
|
|
+ backPolicy.setFirstMinMoney(NumberUtil.multiply100(dto.getFirstMinMoney()).longValue());
|
|
|
+ backPolicy.setFirstMinMoneyType(dto.getFirstMinMoneyType());
|
|
|
+ backPolicy.setFirstMinMoneyRate(dto.getFirstMinMoneyRate());
|
|
|
+ backPolicy.setFirstMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue());
|
|
|
+ backPolicy.setFirstMaxMoneyType(dto.getFirstMaxMoneyType());
|
|
|
+ backPolicy.setFirstMaxMoneyRate(dto.getFirstMaxMoneyRate());
|
|
|
+ backPolicy.setFirstOtherMoneyType(dto.getFirstOtherMoneyType());
|
|
|
+ backPolicy.setFirstOtherMoneyRate(dto.getFirstOtherMoneyRate());
|
|
|
+ backPolicy.setFirstDownLevel(downLevelToString(dto.getFirstDownLevel()));
|
|
|
+ backPolicy.setFirstBackCountOfUser(dto.getFirstBackCountOfUser());
|
|
|
+ backPolicy.setRechargeMinMoney(NumberUtil.multiply100(dto.getRechargeMinMoney()).longValue());
|
|
|
+ backPolicy.setRechargeMinMoneyType(dto.getRechargeMinMoneyType());
|
|
|
+ backPolicy.setRechargeMinMoneyRate(dto.getRechargeMinMoneyRate());
|
|
|
+ backPolicy.setRechargeMaxMoney(NumberUtil.multiply100(dto.getRechargeMaxMoney()).longValue());
|
|
|
+ backPolicy.setRechargeMaxMoneyType(dto.getRechargeMaxMoneyType());
|
|
|
+ backPolicy.setRechargeMaxMoneyRate(dto.getRechargeMaxMoneyRate());
|
|
|
+ backPolicy.setRechargeOtherMoneyType(dto.getRechargeOtherMoneyType());
|
|
|
+ backPolicy.setRechargeOtherMoneyRate(dto.getRechargeOtherMoneyRate());
|
|
|
+ backPolicy.setRechargeDownLevel(downLevelToString(dto.getRechargeDownLevel()));
|
|
|
+ backPolicy.setRechargeBackCountOfUser(dto.getRechargeBackCountOfUser());
|
|
|
+ backPolicy.setRegPayIntervalTime(dto.getRegPayIntervalTime());
|
|
|
+ backPolicy.setBackUnit(dto.getBackUnit());
|
|
|
+ backPolicy.setMarkUpOrder(dto.getMarkUpOrder());
|
|
|
+ backPolicy.setMarkUpOrderMinMoney(dto.getMarkUpOrderMinMoney() == null ? null : NumberUtil.multiply100(dto.getMarkUpOrderMinMoney()).longValue());
|
|
|
+ backPolicy.setMarkUpOrderMinMoneyType(dto.getMarkUpOrderMinMoneyType());
|
|
|
+ backPolicy.setMarkUpOrderMinMoneyRate(dto.getMarkUpOrderMinMoneyRate());
|
|
|
+ backPolicy.setMarkUpOrderMaxMoney(dto.getMarkUpOrderMaxMoney() == null ? null : NumberUtil.multiply100(dto.getMarkUpOrderMaxMoney()).longValue());
|
|
|
+ backPolicy.setMarkUpOrderMaxMoneyType(dto.getMarkUpOrderMaxMoneyType());
|
|
|
+ backPolicy.setMarkUpOrderMaxMoneyRate(dto.getMarkUpOrderMaxMoneyRate());
|
|
|
+ backPolicy.setMarkUpOrderOtherMoneyType(dto.getMarkUpOrderOtherMoneyType());
|
|
|
+ backPolicy.setMarkUpOrderOtherMoneyRate(dto.getMarkUpOrderOtherMoneyRate());
|
|
|
+ backPolicy.setMarkUpDownLevel(downLevelToString(dto.getMarkUpDownLevel()));
|
|
|
+ backPolicy.setMarkUpBackCountOfUser(dto.getMarkUpBackCountOfUser());
|
|
|
+ backPolicy.setLargeAmount(dto.getLargeAmount() == null ? null : NumberUtil.multiply100(dto.getLargeAmount()).longValue());
|
|
|
+ backPolicy.setSupperSmallAmount(dto.getSupperSmallAmount() == null ? null : NumberUtil.multiply100(dto.getSupperSmallAmount()).longValue());
|
|
|
+ backPolicy.setSplitStrategy(CollectionUtils.isEmpty(dto.getSplitStrategy()) ? null : JsonUtil.toString(dto.getSplitStrategy()));
|
|
|
+ backPolicy.setActiveBackSwitch(dto.getActiveBackSwitch());
|
|
|
+ backPolicy.setRoleLevelMin(dto.getRoleLevelMin());
|
|
|
+ } else if (Objects.equals(dto.getPolicyType(), GameBackPolicy.TYPE_SUM_RECHARGE)) {
|
|
|
+ backPolicy.setTypeOfSumRechargeJson(JsonUtil.toString(dto.getTypeOfSumRecharge()));
|
|
|
+ } else if (Objects.equals(dto.getPolicyType(), GameBackPolicy.TYPE_SPLIT_LEVEL)) {
|
|
|
+ backPolicy.setTypeOfSplitLevelJson(JsonUtil.toString(dto.getTypeOfSplitLevel()));
|
|
|
+ }
|
|
|
return gameBackPolicyService.updateById(backPolicy);
|
|
|
}
|
|
|
|