autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 11:35:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2023-10-27 16:50:38 +08:00
parent d49f661eab f0f1b317db
commit ae20816e4a
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {

2
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java
View File

@@ -21,7 +21,7 @@ public class OrderInvoiceRecordVO {
private String orderCodes;
private String status;
private String createTime;
private String uodateTime;
private String updateTime;
private BigDecimal totalAmount;
private BigDecimal totalServiceAmount;
private BigDecimal totalElecAmount;