优化 回调过慢导致订单优先取消, 订单金额未退回的情况

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

@@ -18,6 +18,7 @@ import cn.freemud.entities.vo.order.PaymentConfigVo;
 import cn.freemud.entities.vo.order.PlugInParameter;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
+import cn.freemud.management.service.adapter.OrderManagerAdapter;
 import cn.freemud.management.service.handle.SaasOrderHandle;
 import cn.freemud.management.thirdparty.OrderCallbackClient;
 import cn.freemud.manager.OpenPlatformOrderConfigManager;
@@ -168,6 +169,8 @@ public class OrderAdapterServiceImpl {
     private  EcologyProgramApplicationClient ecologyProgramApplicationClient;
     @Autowired
     private EmailAlertService emailAlertService;
+    @Autowired
+    private OrderManagerAdapter orderManagerAdapter;
 
     //获取下单实现对象
     private OrderFactoryService getCreateOrderBean(AssortmentCustomerInfoVo assortmentCustomerInfoVo, CreateOrderVo createOrderVo) {
@@ -330,7 +333,13 @@ public class OrderAdapterServiceImpl {
             if (NewOrderStatus.CLOSED.getIndex().equals(orderBean.getStatusV2())
                     && Arrays.asList(autoRefundClient.split(",")).contains(client.toString())
                     && Arrays.asList(autoRefundPartnerId.split(",")).contains(orderBean.getCompanyId())) {
-                orderServiceImpl.timeOutRefund(orderBean);
+//                orderServiceImpl.timeOutRefund(orderBean);
+                cn.freemud.management.entities.dto.request.order.OrderManagerRequest request = new cn.freemud.management.entities.dto.request.order.OrderManagerRequest();
+                request.setOrderId(orderBean.getOid());
+                request.setPartnerId(orderBean.getCompanyId());
+                request.setReason("处理订单已关闭,支付未及时回调");
+                request.setOperator("order-application-service");
+                orderManagerAdapter.orderCancel(request);
                 return orderAdapter.sendPaySuccessNoticeMessage();
             }
             // 支付成功处理