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

update

Browse Source
This commit is contained in:
Guoqs
2024-11-18 15:08:54 +08:00
parent fe2cce3765
commit 586e86f731
1 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1215,14 +1215,14 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
// 执行分账 // 执行分账
for (OrderBasicInfo orderBasicInfo : orderBasicInfos) { for (OrderBasicInfo orderBasicInfo : orderBasicInfos) {
try { try {
OrderSplitResult orderSettleResult; OrderSplitResult orderSettleResult = getOrderSplitResult(orderBasicInfo, adapayMemberAccount, appId);
if (OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { // if (OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) {
// 余额支付的订单 // // 余额支付的订单
orderSettleResult = doBalancePaymentWithDelay(orderBasicInfo, adapayMemberAccount, appId); // orderSettleResult = doBalancePaymentWithDelay(orderBasicInfo, adapayMemberAccount, appId);
} else { // } else {
// 在线支付，进行支付确认分账 // // 在线支付，进行支付确认分账
orderSettleResult = doPaymentConfirmWithDelay(orderBasicInfo, adapayMemberAccount, appId); // orderSettleResult = doPaymentConfirmWithDelay(orderBasicInfo, adapayMemberAccount, appId);
} // }
// 记录详情 // 记录详情
ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder() ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder()
.clearingBillCode(clearingBillCode) .clearingBillCode(clearingBillCode)
@@ -1278,6 +1278,22 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
transactionService.saveClearingBill(dto); transactionService.saveClearingBill(dto);
} }
/**
* 单订单分账结果
* @return
*/
private OrderSplitResult getOrderSplitResult(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount, String appId) throws BaseAdaPayException {
OrderSplitResult orderSettleResult;
if (OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) {
// 余额支付的订单
orderSettleResult = doBalancePaymentWithDelay(orderBasicInfo, adapayMemberAccount, appId);
} else {
// 在线支付，进行支付确认分账
orderSettleResult = doPaymentConfirmWithDelay(orderBasicInfo, adapayMemberAccount, appId);
}
return orderSettleResult;
}
/** /**
* 处理订单分账 * 处理订单分账
*/ */
@@ -1536,6 +1552,12 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
*/ */
private void splittingMethod(AfterSettleOrderDTO afterSettleOrderDTO) { private void splittingMethod(AfterSettleOrderDTO afterSettleOrderDTO) {
BigDecimal orderSettleAmount = afterSettleOrderDTO.getOrderSettleAmount(); // 结算金额 BigDecimal orderSettleAmount = afterSettleOrderDTO.getOrderSettleAmount(); // 结算金额
// 订单是否需要分账
if (orderSettleAmount.compareTo(BigDecimal.ZERO) > 0) {
}
// 订单分账
} }
/** /**