diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java index 9b95bd5cb..ab7084102 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java @@ -417,15 +417,16 @@ public class TempService { .build(); QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(build); List paymentConfirms = response.getPaymentConfirms(); - if (!org.springframework.util.CollectionUtils.isEmpty(paymentConfirms)) { + if (CollectionUtils.isEmpty(paymentConfirms)) { + unClearingList.add(clearingBillVO); + } else { clearingBillVO.setConfirmInfo(paymentConfirms.get(0)); clearingList.add(clearingBillVO); - } else { - unClearingList.add(clearingBillVO); } } resultMap.put("clearingList", clearingList); resultMap.put("unClearingList", unClearingList); + resultMap.put("orderSize", clearingBillVOList.size()); return resultMap; } 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 1bafdf136..547e74c67 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 @@ -1365,8 +1365,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderSettleResult = doPaymentConfirmWithDelay(orderBasicInfo, adapayMemberAccount, appId); } - // orderSettleResult = delayMerchantOrderProcessingLogic(orderBasicInfo, adapayMemberAccount, appId); - if (orderSettleResult != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(orderSettleResult.getStatus())) { // 应收金额 = 订单结算金额汇总 receivableAmount = receivableAmount.add(orderBasicInfo.getSettleAmount());