Skip to content

O
order-group
Commit e341079f by 邓杰
Options

配送方式

parent 846db379
Showing with 21 additions and 6 deletions
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
...@@ -762,12 +762,27 @@ public class CheckOrder { ...@@ -762,12 +762,27 @@ public class CheckOrder {
storeDeliveryInfoDto.setDeliveryType("self"); storeDeliveryInfoDto.setDeliveryType("self");
storeDeliveryInfoDto.setPushOrderTime(0); storeDeliveryInfoDto.setPushOrderTime(0);
} else { } else {
if (ObjectUtils.equals(openPlatformIappWxappConfig.getTakeType(), 1)) { //如果是coco查询配送服务判断是平台配送还是自配送
storeDeliveryInfoDto.setDeliveryType("self"); if(cocoPartnerId.equals(storeResponseDto.getPartnerId())){
storeDeliveryInfoDto.setPushOrderTime(0); GetDeliveryFlagRequest getDeliveryFlagRequest = new GetDeliveryFlagRequest();
} else { getDeliveryFlagRequest.setPartnerId(storeResponseDto.getPartnerId());
storeDeliveryInfoDto.setDeliveryType("third"); getDeliveryFlagRequest.setStoreId(storeResponseDto.getStoreId());
storeDeliveryInfoDto.setPushOrderTime(0); DeliveryBaseResponse<GetDeliveryFlagResponseDto> deliveryBaseResponse = deliveryFeiginClient.getThirdDeliveryFlag(getDeliveryFlagRequest);
if(deliveryBaseResponse.getCode() == 100 && deliveryBaseResponse.getData() != null && deliveryBaseResponse.getData().isThirdDeliveryFlag()){
storeDeliveryInfoDto.setDeliveryType("third");
storeDeliveryInfoDto.setPushOrderTime(0);
}else {
storeDeliveryInfoDto.setDeliveryType("self");
storeDeliveryInfoDto.setPushOrderTime(0);
}
}else{
if (ObjectUtils.equals(openPlatformIappWxappConfig.getTakeType(), 1)) {
storeDeliveryInfoDto.setDeliveryType("self");
storeDeliveryInfoDto.setPushOrderTime(0);
} else {
storeDeliveryInfoDto.setDeliveryType("third");
storeDeliveryInfoDto.setPushOrderTime(0);
}
} }
} }
storeDeliveryInfoDto.setDeliveryCondition(deliveryDetail.getDeliveryType()); storeDeliveryInfoDto.setDeliveryCondition(deliveryDetail.getDeliveryType());
......
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