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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-29 11:23:23 +08:00
parent f40e93c26b
commit d4723d9274
1 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -912,20 +912,56 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
clearingBillInfo.setMerchantId(merchantId); clearingBillInfo.setMerchantId(merchantId);
clearingBillInfo.setOrderSource("1"); clearingBillInfo.setOrderSource("1");
// 应收金额
BigDecimal receivableAmount = BigDecimal.ZERO;
// 应清分金额
BigDecimal shouldClearingAmount = BigDecimal.ZERO;
// 实际清分金额
BigDecimal actualClearingAmount = BigDecimal.ZERO;
// 手续费金额
BigDecimal feeAmount = BigDecimal.ZERO;
// 可提现金额
BigDecimal withdrawableAmount = BigDecimal.ZERO;
// 清分账单详情列表
List<ClearingBillDetail> billDetailList = Lists.newArrayList(); List<ClearingBillDetail> billDetailList = Lists.newArrayList();
// 执行分账 // 执行分账
orderBasicInfos.forEach(x -> { for (OrderBasicInfo orderBasicInfo : orderBasicInfos) {
try { try {
PaymentConfirmResponse paymentConfirmResponse = doPaymentConfirm(x, adapayMemberAccount); PaymentConfirmResponse paymentConfirmResponse = doPaymentConfirm(orderBasicInfo, adapayMemberAccount);
if (paymentConfirmResponse != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(paymentConfirmResponse.getStatus())) { if (paymentConfirmResponse != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(paymentConfirmResponse.getStatus())) {
JSONObject jsonObject = JSON.parseObject(paymentConfirmResponse.getDescription()); JSONObject jsonObject = JSON.parseObject(paymentConfirmResponse.getDescription());
String orderCode = (String) jsonObject.get("orderCode"); String orderCode = (String) jsonObject.get("orderCode");
billDetailList.add(ClearingBillDetail.builder().clearingBillCode(clearingBillCode).orderCode(orderCode).build());
// 应收金额 = 订单结算金额汇总
receivableAmount = receivableAmount.add(orderBasicInfo.getSettleAmount());
// 应清分金额 = 订单产生的电费+服务费实际消费 汇总
shouldClearingAmount = shouldClearingAmount.add(orderBasicInfo.getSettleAmount());
// 实际清分金额 = 汇付清分接口返回的清分金额
actualClearingAmount = actualClearingAmount.add(new BigDecimal(paymentConfirmResponse.getConfirm_amt()));
// 手续费金额 = 汇付清分接口返回的手续费金额
feeAmount = feeAmount.add(new BigDecimal(paymentConfirmResponse.getFee_amt()));
// 可提现金额 = 实际清分金额 - 手续费金额
withdrawableAmount = withdrawableAmount
.add(new BigDecimal(paymentConfirmResponse.getConfirm_amt()))
.subtract(new BigDecimal(paymentConfirmResponse.getFee_amt()));
ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder()
.clearingBillCode(clearingBillCode)
.orderCode(orderCode)
.build();
billDetailList.add(clearingBillDetail);
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("订单交易确认失败:{}", x.getOrderCode(), e); logger.error("订单交易确认失败:{}", orderBasicInfo.getOrderCode(), e);
} }
}); }
clearingBillInfo.setReceivableAmount(receivableAmount);
clearingBillInfo.setShouldClearingAmount(shouldClearingAmount);
clearingBillInfo.setFeeAmount(feeAmount);
clearingBillInfo.setWithdrawableAmount(withdrawableAmount);
clearingBillInfo.setActualClearingAmount(actualClearingAmount);
// 保存清分账单 // 保存清分账单
ClearingBillTransactionDTO dto = new ClearingBillTransactionDTO(); ClearingBillTransactionDTO dto = new ClearingBillTransactionDTO();