From 2692cd66b8eeeb12dbd1bfc81daa891823b6fd10 Mon Sep 17 00:00:00 2001 From: wangqx Date: Tue, 23 Sep 2025 16:59:33 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E4=BF=AE=E6=94=B9=E7=BA=A2=E5=8C=85?= =?UTF-8?q?=E5=92=8C=E6=8F=90=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wzj/soopin/transaction/kit/params/impl/OrderCashier.java | 2 +- .../wzj/soopin/transaction/service/impl/DivideServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/kit/params/impl/OrderCashier.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/kit/params/impl/OrderCashier.java index 83cf25f5d..c47fd50e8 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/kit/params/impl/OrderCashier.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/kit/params/impl/OrderCashier.java @@ -56,7 +56,7 @@ public class OrderCashier implements CashierExecute { Order order = orderService.getByNo(payParam.getSn()); // //如果订单已支付，则不能发器支付 - if (order.getStatus().equals(OrderStatusEnum.PAID.name())) { + if (!order.getStatus().equals(OrderStatusEnum.UNPAID.name())) { throw new ServiceException(ResultCode.PAY_DOUBLE_ERROR); } //如果订单状态不是待付款，则抛出异常 diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java index 0fda5420a..6be459dc0 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/DivideServiceImpl.java @@ -175,7 +175,7 @@ public class DivideServiceImpl extends ServiceImpl impleme //获取订单信息 Order order = orderService.getById(orderId); Assert.notNull(order, () -> new ServiceException("订单不存在")); - Assert.isTrue(Objects.equals(order.getStatus(), OrderStatusEnum.PAID.getValue()), () -> new ServiceException("订单未支付")); + Assert.isTrue(Objects.equals(order.getStatus(), OrderStatusEnum.UNPAID.getValue()), () -> new ServiceException("订单未支付")); PayOrder payOrder = payOrderService.getById(order.getPayId()); Assert.notNull(payOrder, () -> new ServiceException("支付单不存在")); Assert.isTrue(payOrder.getTransState() == TransState.PAID.getCode(), () -> new ServiceException("订单未支付"));