|
|
@@ -1628,10 +1628,13 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
//需要退款金额
|
|
|
BigDecimal refundMoney = dayPrice.multiply(BigDecimal.valueOf(betweenDay));
|
|
|
refundInfoResp.setPrice(refundMoney);
|
|
|
+ BigDecimal balance = Optional.ofNullable(orderDon.getBalance()).orElse(BigDecimal.ZERO);
|
|
|
+ //超过本身订单金额 不允许退款
|
|
|
if (refundMoney.compareTo(orderMoney) > 0) {
|
|
|
refundInfoResp.setIsRefund(false);
|
|
|
- //超过价格
|
|
|
- refundInfoResp.setPrice(orderMoney.add(Optional.ofNullable(orderDon.getBalance()).orElse(BigDecimal.ZERO)));
|
|
|
+ }
|
|
|
+ if (refundMoney.compareTo(orderMoney.add(balance)) > 0) {
|
|
|
+ refundInfoResp.setPrice(orderMoney.add(balance));
|
|
|
}
|
|
|
refundInfoResp.setRemainDays(betweenDay);
|
|
|
return refundInfoResp;
|