悬赏招亲

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;
 

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);