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

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

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

@@ -41,6 +41,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -99,7 +100,8 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
     private OrderCommonService orderCommonService;
     @Autowired
     private SellCouponOrderServiceImpl sellCouponOrderService;
-
+    @Value("${saas.autoRefund.client}")
+    private String autoRefundClient;
     @Override
     public BaseResponse createOrderNew(CreateOrderVo createOrderVo) {
         AssortmentCustomerInfoVo assortmentCustomerInfoVo = assortmentCustomerInfoManager.getCustomerInfoByObject(createOrderVo.getSessionId());
@@ -249,8 +251,9 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())){
                 return orderAdapter.sendPaySuccessNoticeMessage();
             }
+            Integer client = OrderSourceType.getClientByCode(orderBean.getSource());
             //若是app订单超时回调了 订单已取消则做退款处理
-            if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus()) && OrderSourceType.SAAS.getCode().equals(orderBean.getSource())) {
+            if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus()) && Arrays.asList(autoRefundClient.split(",")).contains(client)) {
                 orderService.timeOutRefund(orderBean);
                 return orderAdapter.sendPaySuccessNoticeMessage();
             }

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

@@ -3702,13 +3702,15 @@ public class OrderServiceImpl implements Orderservice {
         //调用支付退款
         log.info("payment timeout callback for refund orderDto={}",JSON.toJSONString(orderBean));
         Integer abState = 4;
-        if (abState.equals(orderBean.getAbnormalState())) {
+        if (abState.equals(orderBean.getAbnormalState()) || CollectionUtils.isNotEmpty(orderBean.getRefundList())) {
+            log.info("payment timeout callback for refund is exist");
             return;
         }
         com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> response = null;
         Long refundId = System.currentTimeMillis();
         OrderExtInfoDto orderExtInfoDTO = gson.fromJson(orderBean.getExtInfo(), OrderExtInfoDto.class);
         if (orderExtInfoDTO==null || StringUtils.isBlank(orderExtInfoDTO.getFmId())) {
+            log.info("payment timeout callback for refund not create pre order");
             return;
         }
         Integer state = PayRefundStatus.SUCCESS.getCode();