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 dd5caa539..92188d2eb 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 @@ -1218,11 +1218,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 在线支付,进行支付确认分账 orderSettleResult = doPaymentConfirmWithDelay(orderBasicInfo, adapayMemberAccount, appId); } - + // 记录详情 + ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder() + .clearingBillCode(clearingBillCode) + .orderCode(orderBasicInfo.getOrderCode()) + .createTime(DateUtils.getNowDate()) + .delFlag(DelFlagEnum.NORMAL.getValue()) + .build(); 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()); // 应清分金额 = 订单产生的电费+服务费实际消费 汇总 @@ -1235,14 +1240,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { withdrawableAmount = withdrawableAmount .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(); + clearingBillDetail.setFeeAmt(feeAmt); + clearingBillDetail.setConfirmAmt(confirmAmt); + billDetailList.add(clearingBillDetail); + } else { + clearingBillDetail.setFeeAmt(BigDecimal.ZERO); + clearingBillDetail.setConfirmAmt(BigDecimal.ZERO); billDetailList.add(clearingBillDetail); } } catch (Exception e) {