diff --git a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/rewardconfig/constant/RewardAmountUnitEnum.java b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/rewardconfig/constant/RewardAmountUnitEnum.java index b040f9d..f09cbc2 100644 --- a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/rewardconfig/constant/RewardAmountUnitEnum.java +++ b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/rewardconfig/constant/RewardAmountUnitEnum.java @@ -12,7 +12,9 @@ public enum RewardAmountUnitEnum { NUM(1, "数值"), - PERCENT(2, "百分比"); + PERCENT(2, "百分比"), + + MONTH(3, "月"); @EnumValue @JsonValue diff --git a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/rewardconfig/constant/RewardTypeEnum.java b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/rewardconfig/constant/RewardTypeEnum.java index 4e35942..b94c6c9 100644 --- a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/rewardconfig/constant/RewardTypeEnum.java +++ b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/rewardconfig/constant/RewardTypeEnum.java @@ -35,11 +35,18 @@ public enum RewardTypeEnum { PLATFORM_SERVICE_STORE_UPGRADE_REWARD(204, "平台服务费门店升级佣金"), // 3** 招亲榜 MarriageBounty + //低消 MARRIAGE_BOUNTY_MEETING_MIN_AMOUNT(301, "招亲榜-见面低消"), MARRIAGE_BOUNTY_DATING_MIN_AMOUNT(302, "招亲榜-牵手低消"), - MARRIAGE_BOUNTY_MARRIAGE_MIN_AMOUNT(303, "招亲榜-结婚低消"); + MARRIAGE_BOUNTY_MARRIAGE_MIN_AMOUNT(303, "招亲榜-结婚低消"), + //服务退款有效期 + MARRIAGE_BOUNTY_MEETING_VALIDITY_PERIOD(304, "招亲榜-见面服务有效期"), + + MARRIAGE_BOUNTY_DATING_VALIDITY_PERIOD(305, "招亲榜-牵手服务有效期"), + + MARRIAGE_BOUNTY_MARRIAGE_VALIDITY_PERIOD(306, "招亲榜-结婚服务有效期"); // 4** 红娘合伙人 diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/rewardconfig/entity/RewardConfig.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/rewardconfig/entity/RewardConfig.java index fe1a754..23cec38 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/rewardconfig/entity/RewardConfig.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/rewardconfig/entity/RewardConfig.java @@ -22,14 +22,17 @@ public class RewardConfig extends Entity { @ApiModelProperty("奖励金额单位") private RewardAmountUnitEnum rewardAmountUnit; - @ApiModelProperty("奖励金额") - private BigDecimal rewardAmount; +// @ApiModelProperty("奖励金额") +// private BigDecimal rewardAmount; - public BigDecimal calculate(BigDecimal amount) { + @ApiModelProperty("值") + private String value; + + public BigDecimal calculateReward(BigDecimal amount) { if (RewardAmountUnitEnum.NUM.equals(rewardAmountUnit)) { - return rewardAmount; + return new BigDecimal(value); } else { - return amount.multiply(rewardAmount).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP); + return amount.multiply(new BigDecimal(value)).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP); } } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rewardconfig/user/request/UserEditRewardConfigDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rewardconfig/user/request/UserEditRewardConfigDto.java index 4d64bc6..5d27cfe 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rewardconfig/user/request/UserEditRewardConfigDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/rewardconfig/user/request/UserEditRewardConfigDto.java @@ -24,8 +24,8 @@ public class UserEditRewardConfigDto implements Trans2DomainAssembler