Commit 099bba76 by 徐康

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

parents 6c93c18a 13fc4ab4
...@@ -369,7 +369,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -369,7 +369,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request.setCompleteOrderCode(confirmOrderRequest.getCompleteOrderCode()); request.setCompleteOrderCode(confirmOrderRequest.getCompleteOrderCode());
request.setOrderCode(confirmOrderRequest.getOrderId()); 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())) { if (!org.springframework.util.CollectionUtils.isEmpty(confirmOrderRequest.getOrderSettlements())) {
List<OrderSettlementCreateReq> orderSettlementCreateReqs = new ArrayList<>(); List<OrderSettlementCreateReq> orderSettlementCreateReqs = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment