diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index c856ccd0f..d132a91dc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -3244,11 +3244,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { @Override public void retryRefundOrder(OrderBasicInfo orderBasicInfo) throws BaseAdaPayException { - String orderCode = orderBasicInfo.getOrderCode(); - // 查询订单信息 if (orderBasicInfo == null) { throw new BusinessException(ReturnCodeEnum.CODE_QUERY_ORDER_INFO_IS_NULL); } + // 如果该订单是订单完成状态,并且是微信支付 存在需要退款金额,则进行后续操作 String orderStatus = orderBasicInfo.getOrderStatus(); if (!StringUtils.equals(orderStatus, OrderStatusEnum.ORDER_COMPLETE.getValue())) { @@ -3272,7 +3271,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { String wechatAppId = pileMerchantInfoService.queryAppIdByMerchantId(orderBasicInfo.getMerchantId()); // 如果没有退款过,重新执行一遍退款 ApplyRefundDTO applyRefundDTO = new ApplyRefundDTO(); - applyRefundDTO.setOrderCode(orderCode); + applyRefundDTO.setOrderCode(orderBasicInfo.getOrderCode()); applyRefundDTO.setRefundType(Constants.ONE); applyRefundDTO.setRefundAmount(refundAmount); applyRefundDTO.setWechatAppId(wechatAppId);