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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-10-27 16:42:23 +08:00
parent 64c1e4d2ce
commit f0f1b317db
1 changed files with 13 additions and 10 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); 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())) { if (orderSettleResult != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(orderSettleResult.getStatus())) {
BigDecimal confirmAmt = new BigDecimal(orderSettleResult.getConfirmAmt()); BigDecimal confirmAmt = new BigDecimal(orderSettleResult.getConfirmAmt());
BigDecimal feeAmt = new BigDecimal(orderSettleResult.getFeeAmt()); BigDecimal feeAmt = new BigDecimal(orderSettleResult.getFeeAmt());
// 应收金额 = 订单结算金额汇总 // 应收金额 = 订单结算金额汇总
receivableAmount = receivableAmount.add(orderBasicInfo.getSettleAmount()); receivableAmount = receivableAmount.add(orderBasicInfo.getSettleAmount());
// 应清分金额 = 订单产生的电费+服务费实际消费 汇总 // 应清分金额 = 订单产生的电费+服务费实际消费 汇总
@@ -1235,14 +1240,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
withdrawableAmount = withdrawableAmount withdrawableAmount = withdrawableAmount
.add(confirmAmt) .add(confirmAmt)
.subtract(feeAmt); .subtract(feeAmt);
ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder() clearingBillDetail.setFeeAmt(feeAmt);
.clearingBillCode(clearingBillCode) clearingBillDetail.setConfirmAmt(confirmAmt);
.orderCode(orderBasicInfo.getOrderCode()) billDetailList.add(clearingBillDetail);
.feeAmt(feeAmt) } else {
.confirmAmt(confirmAmt) clearingBillDetail.setFeeAmt(BigDecimal.ZERO);
.createTime(DateUtils.getNowDate()) clearingBillDetail.setConfirmAmt(BigDecimal.ZERO);
.delFlag(DelFlagEnum.NORMAL.getValue())
.build();
billDetailList.add(clearingBillDetail); billDetailList.add(clearingBillDetail);
} }
} catch (Exception e) { } catch (Exception e) {