From da3447cd0b8cfacf8d2b146cddcbfe1b1290b9c7 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 26 Dec 2025 16:21:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E6=89=A7=E8=A1=8C=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E9=A2=9D=E5=A4=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/order/service/impl/PayServiceImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index 8eabbdf3a..e195bf9c8 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -688,10 +688,7 @@ public class PayServiceImpl implements PayService { if (orderInfo.getStatus().equals(OrderStatusEnums.CANCELLED.getCode())) { throw new CzgException("订单已过期不可退单"); } - boolean isFirstRefund = true; - if (orderInfo.getRefundAmount().compareTo(BigDecimal.ZERO) != 0) { - isFirstRefund = false; - } + boolean isFirstRefund = orderInfo.getRefundAmount().compareTo(BigDecimal.ZERO) == 0; ShopInfo shopInfo = shopInfoService.getById(orderInfo.getShopId()); Map returnProMap = new HashMap<>(); boolean isPay = true; @@ -821,8 +818,8 @@ public class PayServiceImpl implements PayService { if (!returnProMap.isEmpty()) { rabbitPublisher.sendOrderRefundMsg(JSONObject.toJSONString(Map.of("orderId", orderInfo.getId(), "returnProMap", returnProMap))); } - refundOrderAfter(orderInfo.getId(), orderInfo.getShopId(), orderInfo.getUserId(), orderInfo.getOrderNo(), - orderInfo.getPointsNum(), isFirstRefund, orderInfo.getStatus().equals(OrderStatusEnums.REFUND.getCode())); + FunUtils.asyncSafeRunVoid(()->refundOrderAfter(orderInfo.getId(), orderInfo.getShopId(), orderInfo.getUserId(), orderInfo.getOrderNo(), + orderInfo.getPointsNum(), isFirstRefund, orderInfo.getStatus().equals(OrderStatusEnums.REFUND.getCode()))); return CzgResult.success(); }