autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-13 03:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

update优化清分账单 保存清分数据

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-09-21 16:11:39 +08:00
parent 9a492bb783
commit 2cbfc161b9
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1280,23 +1280,26 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
} }
if (orderSettleResult != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(orderSettleResult.getStatus())) { 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()); receivableAmount = receivableAmount.add(orderBasicInfo.getSettleAmount());
// 应清分金额 = 订单产生的电费+服务费实际消费 汇总 // 应清分金额 = 订单产生的电费+服务费实际消费 汇总
shouldClearingAmount = shouldClearingAmount.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 withdrawableAmount = withdrawableAmount
.add(new BigDecimal(orderSettleResult.getConfirmAmt())) .add(confirmAmt)
.subtract(new BigDecimal(orderSettleResult.getFeeAmt())); .subtract(feeAmt);
ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder() ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder()
.clearingBillCode(clearingBillCode) .clearingBillCode(clearingBillCode)
.orderCode(orderBasicInfo.getOrderCode()) .orderCode(orderBasicInfo.getOrderCode())
.feeAmt(feeAmt)
.confirmAmt(confirmAmt)
.createTime(DateUtils.getNowDate()) .createTime(DateUtils.getNowDate())
.delFlag(DelFlagEnum.NORMAL.getValue()) .delFlag(DelFlagEnum.NORMAL.getValue())
.build(); .build();