Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa

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

@@ -380,6 +380,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         // 引入门店基础服务 查询自动制作完成配置时间，预约单单独超时任务设置
         if(confirmOrderRequest.getTimeout() == null || confirmOrderRequest.getTimeout() == 0) {
             request.setTimeout(getMCCafePaySuccessTimeout(confirmOrderRequest,request));
+        } else {
+            request.setTimeout(confirmOrderRequest.getTimeout());
         }
 
         if (!org.springframework.util.CollectionUtils.isEmpty(confirmOrderRequest.getOrderSettlements())) {