diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java b/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java index ed0218b6..e31306af 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java +++ b/ghy-payment/src/main/java/com/ghy/payment/service/impl/PayCallbackService.java @@ -50,8 +50,14 @@ public class PayCallbackService implements CallBackService { param.setStatus(payment.getStatus()); param.setPayTime(LocalDateTime.now()); financialMasterService.updatePayment(param); - if (AdapayStatusEnum.succeeded.code.equals(payment.getStatus())) { + if(payment.getOrderNo().split("_").length > 2){ + FinancialChangeRecord financialChangeRecord = new FinancialChangeRecord(); + financialChangeRecord.setId(payment.getOrderNo().split("_")[1]); + financialChangeRecord.setPayStatus(1L); + financialChangeRecordService.updateFinancialChangeRecord(financialChangeRecord); + // TODO 拆分对应的分账流水 + } // 更新主财务单状态 financialMasterService.paySucceeded(payment.getId(), payment.getPayChannel()); } else { @@ -75,13 +81,6 @@ public class PayCallbackService implements CallBackService { update.setOrderMasterCode(payment.getOrderNo().split("_")[0]); update.setPaymentId(payment.getId()); financialMasterService.updateFinancialMaster(update); - if(payment.getOrderNo().split("_").length > 2){ - FinancialChangeRecord financialChangeRecord = new FinancialChangeRecord(); - financialChangeRecord.setId(payment.getOrderNo().split("_")[1]); - financialChangeRecord.setPayStatus(1L); - financialChangeRecordService.updateFinancialChangeRecord(financialChangeRecord); - // TODO 拆分对应的分账流水 - } } else { logger.warn("发起支付失败 : {}", response.toJSONString()); }