final.拦截退款失败,逻辑不往下走

order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

@@ -376,7 +376,7 @@ public class PaymentHandle {
         if (multiOrderRefundResponse == null || multiOrderRefundResponse.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.ORDER_PAY_RESPONSE_SUCCESS.equals(multiOrderRefundResponse.getCode())) {
             // fisherman 退款异常 也当做 退款中处理
             refundStatus = PayRefundStatus.RUNNING;
-        }
+        }else {
             List<MultiOrderRefundResponse.RefundPlatformResponse> refundPlatformResponseList = multiOrderRefundResponse.getData().refundPlatformResponseList;
             if (null != refundPlatformResponseList && refundPlatformResponseList.size() > 0) {
                 redisCache.save(RedisUtil.getPaymentTransIdSequenceKey(refundPlatformResponseList.get(0).getTransId()), orderBean.getOid(), 1L, TimeUnit.DAYS);
@@ -397,6 +397,7 @@ public class PaymentHandle {
                     refundStatus = PayRefundStatus.RUNNING;
                 }
             }
+        }
         return handlePayRefundResponse(refundStatus, multiOrderRefundRequest.getRefundTradeNo());
     }
 

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -248,8 +248,8 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.COMPATIBILITY_STATUS.getCode()) == 0) {
             return ResponseUtil.error(refundResponse.getResult());
         }
-        // fisherman --> 退款中的状态 阻止后续流程 等待支付回调
-        if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.RUNNING.getCode()) == 0) {
+        // fisherman --> 退款中的状态 阻止后续流程 等待支付回调  不是退款成功 都终止下面的退款流程
+        if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
             return ResponseUtil.error(ResponseResult.REFUND_FAIL_WAIT_CALLBACK);
         }