diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index d9636eb24..7428f219e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1215,14 +1215,14 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { // 执行分账 for (OrderBasicInfo orderBasicInfo : orderBasicInfos) { try { - OrderSplitResult orderSettleResult; - if (OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { - // 余额支付的订单 - orderSettleResult = doBalancePaymentWithDelay(orderBasicInfo, adapayMemberAccount, appId); - } else { - // 在线支付,进行支付确认分账 - orderSettleResult = doPaymentConfirmWithDelay(orderBasicInfo, adapayMemberAccount, appId); - } + OrderSplitResult orderSettleResult = getOrderSplitResult(orderBasicInfo, adapayMemberAccount, appId); + // if (OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { + // // 余额支付的订单 + // orderSettleResult = doBalancePaymentWithDelay(orderBasicInfo, adapayMemberAccount, appId); + // } else { + // // 在线支付,进行支付确认分账 + // orderSettleResult = doPaymentConfirmWithDelay(orderBasicInfo, adapayMemberAccount, appId); + // } // 记录详情 ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder() .clearingBillCode(clearingBillCode) @@ -1278,6 +1278,22 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { 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) { BigDecimal orderSettleAmount = afterSettleOrderDTO.getOrderSettleAmount(); // 结算金额 + // 订单是否需要分账 + if (orderSettleAmount.compareTo(BigDecimal.ZERO) > 0) { + } + + // 订单分账 + } /**