Browse Source

利息计算接口更改

liyuan 1 tháng trước cách đây
mục cha
commit
2ada277206

+ 3 - 1
blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -8368,8 +8368,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (CollectionUtils.isEmpty(orderItemsList)) {
 			return R.fail("缺少订单明细数据,请查看订单");
 		}
+		// 配资比例
+		BigDecimal proportion = order.getFundingRatio().divide(BigDecimal.valueOf(100), NumberEnum.SIX.number, RoundingMode.DOWN);
 		BigDecimal daysInterestRate = order.getInterestRate().divide(BigDecimal.valueOf(100), NumberEnum.TWO.number, RoundingMode.DOWN).divide(BigDecimal.valueOf(365) ,NumberEnum.TEN.number, RoundingMode.DOWN);
-		BigDecimal interestAmount = order.getOrderAmount().multiply(BigDecimal.valueOf(0.8)).multiply(daysInterestRate).multiply(BigDecimal.valueOf(order.getDays())).setScale(2, RoundingMode.DOWN);
+		BigDecimal interestAmount = order.getOrderAmount().multiply(proportion).multiply(daysInterestRate).multiply(BigDecimal.valueOf(order.getDays())).setScale(2, RoundingMode.DOWN);
 		order.setInterestAmount(interestAmount);
 		int size = orderItemsList.size();
 		// 除最后一条外前面的利息金额都是整数