|
|
@@ -2528,6 +2528,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
//该订单月份
|
|
|
int month = DateUtil.month(orderDon.getCreatedTime()) + 1;
|
|
|
BigDecimal refundBalance = BigDecimal.ZERO;
|
|
|
+ BigDecimal refundMoney = BigDecimal.ZERO;
|
|
|
//2年
|
|
|
if ((sku.getDays() != null && sku.getDays() == 730) || (sku.getMonths() != null && sku.getMonths() == 24)) {
|
|
|
//第二年未生效
|
|
|
@@ -2545,8 +2546,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
refundBalance = refundBalance.add(thisRefundMoney);
|
|
|
} else {
|
|
|
if (thisRefundMoney.compareTo(money) > 0) {
|
|
|
- BigDecimal refundMoney = money;
|
|
|
- orderRefundDto.setRefundMoney(refundMoney);
|
|
|
+ refundMoney = money;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -2561,6 +2561,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
//12月买的 退200余额
|
|
|
refundBalance = refundBalance.add(BigDecimal.valueOf(20000));
|
|
|
}
|
|
|
+ orderRefundDto.setRefundMoney(refundMoney);
|
|
|
orderRefundDto.setRefundBalance(refundBalance);
|
|
|
return orderRefundDto;
|
|
|
}
|