Merge branch 'feature/2.1.11-支付超时回调直接退款' into qa

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -3702,6 +3702,7 @@ public class OrderServiceImpl implements Orderservice {
         //调用支付退款
         log.info("payment timeout callback for refund orderDto={}",JSON.toJSONString(orderBean));
         Integer abState = 4;
+        String  noPay   = "8200404";
         if (abState.equals(orderBean.getAbnormalState()) ) {
             log.info("payment timeout callback for refund is exist");
             return;
@@ -3717,9 +3718,13 @@ public class OrderServiceImpl implements Orderservice {
         orderBean.setPayVoucher(orderExtInfoDTO.getFmId());
         SdkUpdateAbnormalState sdkUpdateAbnormalState = new SdkUpdateAbnormalState();
         String desc = "支付未及时回调";
+
         com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid());
         response = standardPaymentService.orderRefund(orderPayRefundRequest, LogTreadLocal.getTrackingNo());
         log.info("payment timeout callback for refund  orderId={},request={},resp={}",orderBean.getOid(),JSON.toJSONString(orderPayRefundRequest),JSON.toJSONString(response));
+        if (response!=null && noPay.equals(response.getCode())) {
+            return;
+        }
         if (response!=null || state.equals(response.getData().getRefundStatus())) {
             sdkUpdateAbnormalState.setAbnormalDesc(desc+",退款成功");
         } else {