diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index c67f6c39e..f5aaef919 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1280,23 +1280,26 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } if (orderSettleResult != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(orderSettleResult.getStatus())) { + BigDecimal confirmAmt = new BigDecimal(orderSettleResult.getConfirmAmt()); + BigDecimal feeAmt = new BigDecimal(orderSettleResult.getFeeAmt()); + // 应收金额 = 订单结算金额汇总 receivableAmount = receivableAmount.add(orderBasicInfo.getSettleAmount()); // 应清分金额 = 订单产生的电费+服务费实际消费 汇总 shouldClearingAmount = shouldClearingAmount.add(orderBasicInfo.getSettleAmount()); // 实际清分金额 = 汇付清分接口返回的清分金额 - actualClearingAmount = actualClearingAmount.add(new BigDecimal(orderSettleResult.getConfirmAmt())); + actualClearingAmount = actualClearingAmount.add(confirmAmt); // 手续费金额 = 汇付清分接口返回的手续费金额 - feeAmount = feeAmount.add(new BigDecimal(orderSettleResult.getFeeAmt())); + feeAmount = feeAmount.add(feeAmt); // 可提现金额 = 实际清分金额 - 手续费金额 withdrawableAmount = withdrawableAmount - .add(new BigDecimal(orderSettleResult.getConfirmAmt())) - .subtract(new BigDecimal(orderSettleResult.getFeeAmt())); - + .add(confirmAmt) + .subtract(feeAmt); ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder() .clearingBillCode(clearingBillCode) .orderCode(orderBasicInfo.getOrderCode()) - + .feeAmt(feeAmt) + .confirmAmt(confirmAmt) .createTime(DateUtils.getNowDate()) .delFlag(DelFlagEnum.NORMAL.getValue()) .build();