From 7269e18a72ce7af7fac153074870a9036b44bc65 Mon Sep 17 00:00:00 2001 From: Derran Date: Sun, 29 Sep 2024 14:06:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=AC=E8=B5=8F=E6=8B=9B=E4=BA=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/UserGetMarriageBountyOrderPreRefundInfoVo.java | 3 +++ .../impl/MarriageBountyOrderQueryServiceImpl.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) 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 9588fe3..825fdd0 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 @@ -26,6 +26,9 @@ public class UserGetMarriageBountyOrderPreRefundInfoVo { @ApiModelProperty("可退款结果礼金") private BigDecimal refundableResultGift = BigDecimal.ZERO; + @ApiModelProperty("可退款金额") + private BigDecimal refundableAmount = BigDecimal.ZERO; + @ApiModelProperty("是否可以退款") private Boolean refundable = false; 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 4e940dc..86eb4a4 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 @@ -79,7 +79,8 @@ public class MarriageBountyOrderQueryServiceImpl implements MarriageBountyOrderQ refundInfoVo.setRefundableMeetingFee(refundableMeetingFee); refundInfoVo.setRefundableMeetingQuantity(refundableMeetingQuantity); refundInfoVo.setRefundableResultGift(refundableResultGift); - refundInfoVo.setRefundable(refundableMeetingFee.compareTo(BigDecimal.ZERO) > 0 || refundableResultGift.compareTo(BigDecimal.ZERO) > 0); + refundInfoVo.setRefundableAmount(refundableMeetingFee.multiply(BigDecimal.valueOf(refundableMeetingQuantity)).add(refundableResultGift)); + refundInfoVo.setRefundable(refundInfoVo.getRefundableAmount().compareTo(BigDecimal.ZERO) > 0); //服务退款有效期校验 RewardTypeEnum rewardType = marriageBountyOrder.getValidityPeriodType(); RewardConfig rewardConfig = rewardConfigQueryService.queryByRewardType(rewardType);