diff --git a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/marriagebount/constant/MarriageBountyOrderType.java b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/marriagebount/constant/MarriageBountyOrderType.java index e028ee3..fa0ca4c 100644 --- a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/marriagebount/constant/MarriageBountyOrderType.java +++ b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/marriagebount/constant/MarriageBountyOrderType.java @@ -10,11 +10,11 @@ import lombok.Getter; @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MarriageBountyOrderType { - MEETING(1, "见面"), + MEETING(1, "悬赏-包见面"), - DATING(2, "恋爱"), + DATING(2, "悬赏-包牵手"), - MARRIAGE(3, "结婚"); + MARRIAGE(3, "悬赏-包结婚"); @EnumValue @JsonValue diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriagebounty/user/response/UserGetMarriageBountyOrderPreRefundInfoVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriagebounty/user/response/UserGetMarriageBountyOrderPreRefundInfoVo.java index dfc72b3..9588fe3 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriagebounty/user/response/UserGetMarriageBountyOrderPreRefundInfoVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/marriagebounty/user/response/UserGetMarriageBountyOrderPreRefundInfoVo.java @@ -28,4 +28,7 @@ public class UserGetMarriageBountyOrderPreRefundInfoVo { @ApiModelProperty("是否可以退款") private Boolean refundable = false; + + @ApiModelProperty("不可退款原因") + private String nonRefundableReason = "无法撤销"; } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java index d74d270..4e940dc 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/marriagebounty/impl/MarriageBountyOrderQueryServiceImpl.java @@ -83,8 +83,11 @@ public class MarriageBountyOrderQueryServiceImpl implements MarriageBountyOrderQ //服务退款有效期校验 RewardTypeEnum rewardType = marriageBountyOrder.getValidityPeriodType(); RewardConfig rewardConfig = rewardConfigQueryService.queryByRewardType(rewardType); - if (Objects.nonNull(rewardConfig)&&LocalDateTime.now().isBefore(rewardConfig.getRefundableTime(marriageBountyOrder.getCreateTime()))) { + if (Objects.nonNull(rewardConfig) && LocalDateTime.now().isBefore(rewardConfig.getRefundableTime(marriageBountyOrder.getCreateTime()))) { refundInfoVo.setRefundable(false); + //补充因有效期原因无法撤销原因 悬赏-包牵手(6月)正在服务中,无法撤销,如有疑问或特殊情况请联系客服处理; + refundInfoVo.setNonRefundableReason(marriageBountyOrder.getType().getDesc() + "(" + rewardConfig.getValue() + "月)" + + "正在服务中,无法撤销,如有疑问或特殊情况请联系客服处理"); } } return refundInfoVo; @@ -112,7 +115,7 @@ public class MarriageBountyOrderQueryServiceImpl implements MarriageBountyOrderQ productInfoVo.setType(marriageBountyOrder.getType()); productInfoVo.setRewardAmount(marriageBountyOrder.getRewardAmount()); productInfoVo.setMeetingQuantity(marriageBountyOrder.getMeetingQuantity()); - if(MarriageBountyOrderVersion.V1.equals(marriageBountyOrder.getVersion())) { + if (MarriageBountyOrderVersion.V1.equals(marriageBountyOrder.getVersion())) { int usedMeetingQuantity = 0; int usableMeetingQuantity = 0; for (MarriageBountyOrderReward orderReward : marriageBountyOrder.getOrderRewardList()) { @@ -129,7 +132,7 @@ public class MarriageBountyOrderQueryServiceImpl implements MarriageBountyOrderQ } productInfoVo.setUsedMeetingQuantity(usedMeetingQuantity); productInfoVo.setUsableMeetingQuantity(usableMeetingQuantity); - }else { + } else { //新版本,不限制推荐人数 可用见面次数>0 即可 productInfoVo.setUsedMeetingQuantity(0); productInfoVo.setUsableMeetingQuantity(999);