|
@@ -468,6 +468,7 @@ public class PayServiceImpl implements PayService {
|
|
|
int i = 0;
|
|
|
BigDecimal hasRouteAmount = BigDecimal.ZERO;
|
|
|
BigDecimal hasRouteBalanceAmount = BigDecimal.ZERO;
|
|
|
+ BigDecimal hasRouteMoney = BigDecimal.ZERO;
|
|
|
List<Map<String, Object>> tempRoutingList = new ArrayList<>();
|
|
|
|
|
|
PaymentChannelEnum patType = null;
|
|
@@ -482,9 +483,11 @@ public class PayServiceImpl implements PayService {
|
|
|
}
|
|
|
BigDecimal routingFee = routingAmount.multiply(new BigDecimal(routeScaleDto.getScale())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP);
|
|
|
BigDecimal routeBalanceAmount = balanceAmount.multiply(new BigDecimal(routeScaleDto.getScale())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP);
|
|
|
+ BigDecimal routingMoney = routingAmount.multiply(new BigDecimal(routeScaleDto.getScale())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP);
|
|
|
if (i == routeScaleDtos.size()) {
|
|
|
routingFee = routingAmount.subtract(hasRouteAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
routeBalanceAmount = balanceAmount.subtract(hasRouteBalanceAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
+ routingMoney = amount.subtract(hasRouteMoney).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
}
|
|
|
hasRouteAmount = hasRouteAmount.add(routingFee);
|
|
|
hasRouteBalanceAmount = hasRouteBalanceAmount.add(routeBalanceAmount);
|
|
@@ -501,7 +504,7 @@ public class PayServiceImpl implements PayService {
|
|
|
studentPaymentRouteOrder.setOrderNo(orderNo);
|
|
|
studentPaymentRouteOrder.setRouteOrganId(routeScaleDto.getOrganId());
|
|
|
studentPaymentRouteOrder.setFeeFlag(routeScaleDto.getFeeFlag());
|
|
|
- studentPaymentRouteOrder.setRouteAmount(routingFee);
|
|
|
+ studentPaymentRouteOrder.setRouteAmount(routingMoney);
|
|
|
studentPaymentRouteOrder.setRouteBalanceAmount(routeBalanceAmount);
|
|
|
studentPaymentRouteOrder.setMerNo(routeScaleDto.getMerNo());
|
|
|
RouteOrders.add(studentPaymentRouteOrder);
|