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(); }