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 faead4c..9954967 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 @@ -43,13 +43,13 @@ public enum RewardTypeEnum { */ MATCHMAKER_JOIN_RECOMMEND_EQUAL_LEVEL(121, "红娘入驻推荐奖励--平级推荐"), - MATCHMAKER_JOIN_RECOMMEND_DOWN_LEVEL(122,"红娘入驻推荐奖励--向下推荐奖励差"), + MATCHMAKER_JOIN_RECOMMEND_DOWN_LEVEL(122, "红娘入驻推荐奖励--向下推荐奖励差"), - MATCHMAKER_JOIN_RECOMMEND_DOWN_MAX(123,"红娘入驻向下推荐最大奖励"), + MATCHMAKER_JOIN_RECOMMEND_DOWN_MAX(123, "红娘入驻向下推荐最大奖励"), - MATCHMAKER_JOIN_RECOMMEND_UP_LEVEL(124,"红娘入驻推荐奖励--向上推荐奖励差"), + MATCHMAKER_JOIN_RECOMMEND_UP_LEVEL(124, "红娘入驻推荐奖励--向上推荐奖励差"), - MATCHMAKER_JOIN_RECOMMEND_UP_MIN(125,"红娘入驻向上推荐最小奖励"), + MATCHMAKER_JOIN_RECOMMEND_UP_MIN(125, "红娘入驻向上推荐最小奖励"), // 2** 服务费 @@ -61,19 +61,22 @@ public enum RewardTypeEnum { PLATFORM_SERVICE_STORE_UPGRADE_REWARD(204, "平台服务费门店升级佣金"), + WITHDRAW_SERVICE_FEE(205, "提现手续费"), + // 3** 招亲榜 MarriageBounty //低消 - MARRIAGE_BOUNTY_MEETING_MIN_AMOUNT(301, "招亲榜-见面低消"), + MARRIAGE_BOUNTY_MEETING_MIN_AMOUNT(301,"招亲榜-见面低消"), + + MARRIAGE_BOUNTY_DATING_MIN_AMOUNT(302,"招亲榜-牵手低消"), - 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_MEETING_VALIDITY_PERIOD(304,"招亲榜-见面服务有效期"), - MARRIAGE_BOUNTY_DATING_VALIDITY_PERIOD(305, "招亲榜-牵手服务有效期"), + MARRIAGE_BOUNTY_DATING_VALIDITY_PERIOD(305,"招亲榜-牵手服务有效期"), - MARRIAGE_BOUNTY_MARRIAGE_VALIDITY_PERIOD(306, "招亲榜-结婚服务有效期"); + MARRIAGE_BOUNTY_MARRIAGE_VALIDITY_PERIOD(306,"招亲榜-结婚服务有效期"); @EnumValue @JsonValue diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java index 3a18ff9..21dd359 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/withdrawaudit/entity/WithdrawAudit.java @@ -35,6 +35,12 @@ public class WithdrawAudit extends Entity { @ApiModelProperty("提现金额") private BigDecimal withdrawAmount; + @ApiModelProperty("提现服务费") + private BigDecimal withdrawServiceFee; + + @ApiModelProperty("到账金额") + private BigDecimal arrivalAmount; + @ApiModelProperty("提现类型") private WithdrawTypeEnum withdrawType; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/bankcard/user/BankCardUserCommandController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/bankcard/user/BankCardUserCommandController.java index 551e7e6..a1ce8f2 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/bankcard/user/BankCardUserCommandController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/bankcard/user/BankCardUserCommandController.java @@ -26,7 +26,7 @@ public class BankCardUserCommandController { BankCard bankCard = dto.trans2Domain(); bankCard.setUserId(userId); bankCard.setIdentityType(IdentityTypeEnum.INDIVIDUAL); - bankCardApplicationService.create(dto.trans2Domain()); + bankCardApplicationService.create(bankCard); } @ApiOperation("用户删除银行卡")