Merge remote-tracking branch 'origin/qa' into qa

order-application-service/src/main/java/cn/freemud/entities/dto/QueryOrdersResponseDto.java

@@ -200,7 +200,7 @@ public class QueryOrdersResponseDto {
 
             private List<OrderCostResp> orderCostDetailList;
             private List<QueryOrdersResponse.DataBean.OrderBean.OrderPayItem> orderPayItem;
-
+            private Integer abnormalState;
             /**
              * 订单操作状态(从订单操作历史表中获取)
              */

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

@@ -3701,6 +3701,10 @@ public class OrderServiceImpl implements Orderservice {
     public void timeOutRefund(QueryOrdersResponseDto.DataBean.OrderBean orderBean) {
         //调用支付退款
         log.info("payment timeout callback for refund orderDto={}",JSON.toJSONString(orderBean));
+        Integer abState = 4;
+        if (abState.equals(orderBean.getAbnormalState())) {
+            return;
+        }
         com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> response = null;
         Long refundId = System.currentTimeMillis();
         OrderExtInfoDto orderExtInfoDTO = gson.fromJson(orderBean.getExtInfo(), OrderExtInfoDto.class);