From b3734d014c88cd03742ba3ae6074df18575fe3c0 Mon Sep 17 00:00:00 2001 From: HH Date: Sun, 16 Apr 2023 11:26:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/order/service/impl/OrderDetailServiceImpl.java | 3 ++- .../com/ghy/order/service/impl/OrderMasterServiceImpl.java | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java index c58377d3..8fd59a0a 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java @@ -298,7 +298,8 @@ public class OrderDetailServiceImpl implements OrderDetailService { FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(orderDetailId); Assert.notNull(financialMaster, "找不到支付记录"); Assert.hasText(financialMaster.getPaymentId(), "找不到订单的支付记录，请联系管理员"); - Assert.isTrue(PayStatus.PAID.getCode().equals(financialMaster.getPayStatus()), "订单未支付"); + Assert.isTrue(PayStatus.PAID.getCode().equals(financialMaster.getPayStatus()) || + PayStatus.PAYED_ADD.getCode().equals(financialMaster.getPayStatus()), "订单未支付"); // 主财务单金额 BigDecimal masterMoney = financialMaster.getPayMoney(); diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java index a0140843..8e4d7164 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java @@ -359,9 +359,6 @@ public class OrderMasterServiceImpl implements OrderMasterService { Long orderMasterId = orderMaster.getId(); FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMasterId); Assert.notNull(financialMaster, "找不到订单"); - Assert.isTrue(!PayStatus.WAIT_PAY.getCode().equals(financialMaster.getPayStatus()), "订单未支付"); - Assert.isTrue(!PayStatus.CANCEL.getCode().equals(financialMaster.getPayStatus()), "订单已取消"); - Assert.isTrue(!PayStatus.REFUND.getCode().equals(financialMaster.getPayStatus()), "订单已退款"); boolean paid = PayStatus.PAID.getCode().equals(financialMaster.getPayStatus()) || PayStatus.PAYED_ADD.getCode().equals(financialMaster.getPayStatus()); Assert.isTrue(paid, "订单未支付");