Commit c9e0a308 by 徐康

麦咖啡超时时间只取超时关单配置,不取超时接单配置

parent 13fc4ab4
...@@ -347,8 +347,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -347,8 +347,7 @@ 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(getMCCafePaySuccessTimeout(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<>();
...@@ -561,6 +560,32 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -561,6 +560,32 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
return timeout; return timeout;
} }
/**
* 获取麦咖啡支付成功 超时取消订单或者超时接单时间
* @param confirmOrderRequest
* @return
*/
private Integer getMCCafePaySuccessTimeout(ConfirmOrderRequest confirmOrderRequest,PaySuccessReq request){
Integer timeout = 0;
StoreInfoRequest storeInfoRequest = new StoreInfoRequest();
storeInfoRequest.setPartnerId(confirmOrderRequest.getPartnerId());
storeInfoRequest.setStoreCode(confirmOrderRequest.getStoreId());
StoreResponse storeResponse = storeCenterService.getStoreInfo(storeInfoRequest, confirmOrderRequest.getTrackingNo());
if (storeResponse != null && storeResponse.getBizVO() != null ) {
StoreResponse.Configuration configuration = storeResponse.getBizVO().getStoreConfig();
//配置为空超时取消订单
if (configuration == null || org.apache.commons.lang.StringUtils.isBlank(configuration.getOverTimeCloseOrder())){
timeout = 30;
}
//超时关单开启
if(configuration != null && ObjectUtils.equals("1", configuration.getOverTimeCloseOrder())
&& StringUtils.isNotBlank(configuration.getOverTimeCloseOrderTime())){
timeout = Integer.parseInt(configuration.getOverTimeCloseOrderTime());
}
}
return timeout;
}
@Override @Override
......
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