Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由'

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -369,7 +369,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setCompleteOrderCode(confirmOrderRequest.getCompleteOrderCode());
         request.setOrderCode(confirmOrderRequest.getOrderId());
         // 引入门店基础服务 查询自动制作完成配置时间，预约单单独超时任务设置
-        request.setTimeout(getPaySuccessTimeout(confirmOrderRequest,request));
+//        request.setTimeout(getPaySuccessTimeout(confirmOrderRequest,request));
+        request.setTimeout(0);
 
         if (!org.springframework.util.CollectionUtils.isEmpty(confirmOrderRequest.getOrderSettlements())) {
             List<OrderSettlementCreateReq> orderSettlementCreateReqs = new ArrayList<>();