From 137db44117986fc013a4f28237f8a6914ea3e196 Mon Sep 17 00:00:00 2001 From: terrfly Date: Wed, 26 Jan 2022 16:53:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E8=B4=A6mq=E4=B8=8D=E5=9C=A8=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/service/PayOrderDivisionProcessService.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/PayOrderDivisionProcessService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/PayOrderDivisionProcessService.java index c9f156c..1eaa944 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/PayOrderDivisionProcessService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/PayOrderDivisionProcessService.java @@ -90,14 +90,10 @@ public class PayOrderDivisionProcessService { throw new BizException("订单不存在"); } - // 订单不是成功状态 || 分账状态不正确 - if(payOrder.getState() != PayOrder.STATE_SUCCESS || - ( - payOrder.getDivisionState() != PayOrder.DIVISION_STATE_WAIT_TASK - && payOrder.getDivisionState() != PayOrder.DIVISION_STATE_UNHAPPEN - )){ - log.error("{}, 订单状态或分账状态不正确", logPrefix); - throw new BizException("订单状态或分账状态不正确"); + // 分账状态不正确 + if(payOrder.getDivisionState() != PayOrder.DIVISION_STATE_WAIT_TASK && payOrder.getDivisionState() != PayOrder.DIVISION_STATE_UNHAPPEN){ + log.error("{}, 分账状态不正确", logPrefix); + throw new BizException("分账状态不正确"); } //更新订单为： 分账任务处理中