代码合并

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -144,6 +144,8 @@ public interface Orderservice {
     BaseResponse queryCollageOrderById(Integer operation,String sessionId, String oid, String partnerId,String channel);
 
 
+    BaseResponse timeOutOrderRefund(TimeOutOrderVo timeOutOrderVo);
+
     BaseResponse queryOrderRider(OrderRiderRequestVo requestVo);
 
     BaseResponse platformPaysuccess(PlatformPaySuccessRequest requestVo);

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

@@ -247,7 +247,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
             Integer client = OrderSourceType.getClientByCode(orderBean.getSource());
             //若是app订单超时回调了 订单已取消则做退款处理
             if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus()) && Arrays.asList(autoRefundClient.split(",")).contains(client.toString())) {
-                orderService.timeOutRefund(orderBean);
+//                orderService.timeOutRefund(orderBean);
                 return orderAdapter.sendPaySuccessNoticeMessage();
             }
             /*

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

@@ -1187,6 +1187,11 @@ public class OrderServiceImpl implements Orderservice {
     }
 
     @Override
+    public BaseResponse timeOutOrderRefund(TimeOutOrderVo timeOutOrderVo) {
+        return null;
+    }
+
+    @Override
     public BaseResponse queryOrderRider(OrderRiderRequestVo requestVo) {
         AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(requestVo.getSessionId());
         if (userLoginInfoDto == null || StringUtils.isBlank(userLoginInfoDto.getMemberId())) {